mesa/es: Fix build issue after merge.

In cd6b8dd9e82fedc55d033131fbc0f8ee950567c8, color read/type fields are
moved;  Based on 068596c9a7e8d330ffdff8ad8700bd6093b5bdea and
cc020425e929110613ddb405d3e82313d27a35ed, GLSL builtin library is
autogenerated and GLSL libraries are built and used.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es
index 1254f06..566cd75 100644 (file)
--- a/configs/linux-opengl-es
+++ b/configs/linux-opengl-es
@@ -6,7 +6,7 @@ CONFIG_NAME = linux-opengl-es
 
 # Directories to build
 LIB_DIR = lib
-SRC_DIRS = egl mesa/es gallium gallium/winsys
+SRC_DIRS = egl glsl mesa/es gallium gallium/winsys
 PROGRAM_DIRS = es1/screen es1/xegl es2/xegl
 
 # no mesa or egl drivers

diff --git a/src/mesa/es/Makefile b/src/mesa/es/Makefile
index 6a4756c..ca38dc4 100644 (file)
--- a/src/mesa/es/Makefile
+++ b/src/mesa/es/Makefile
@@ -63,23 +63,23 @@ $(ES2_OBJ_DIR)/%.o: $(MESA)/%.c
 $(ES2_OBJ_DIR)/%.o: $(MESA)/%.S
        $(call es-compile,2)
 
-libes1.a: $(ES1_OBJECTS)
-       @$(TOP)/bin/mklib -o es1 -static $(ES1_OBJECTS)
+libes1.a: $(ES1_OBJECTS) $(GLSL_LIBS)
+       @$(MKLIB) -o es1 -static $(ES1_OBJECTS) $(GLSL_LIBS)
 
-libes2.a: $(ES2_OBJECTS)
-       @$(TOP)/bin/mklib -o es2 -static $(ES1_OBJECTS)
+libes2.a: $(ES2_OBJECTS) $(GLSL_LIBS)
+       @$(MKLIB) -o es2 -static $(ES1_OBJECTS) $(GLSL_LIBS)
 
-libes1gallium.a: $(ES1_GALLIUM_OBJECTS)
-       @$(TOP)/bin/mklib -o es1gallium -static $(ES1_GALLIUM_OBJECTS)
+libes1gallium.a: $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS)
+       @$(MKLIB) -o es1gallium -static $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS)
 
-libes2gallium.a: $(ES2_GALLIUM_OBJECTS)
-       @$(TOP)/bin/mklib -o es2gallium -static $(ES2_GALLIUM_OBJECTS)
+libes2gallium.a: $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)
+       @$(MKLIB) -o es2gallium -static $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)
 
 libes1api.a: $(ES1_API_OBJECTS)
-       @$(TOP)/bin/mklib -o es1api -static $(ES1_API_OBJECTS)
+       @$(MKLIB) -o es1api -static $(ES1_API_OBJECTS)
 
 libes2api.a: $(ES2_API_OBJECTS)
-       @$(TOP)/bin/mklib -o es2api -static $(ES2_API_OBJECTS)
+       @$(MKLIB) -o es2api -static $(ES2_API_OBJECTS)
 
 GENERATED_SOURCES :=           \
        main/api_exec_es1.c     \
@@ -115,6 +115,7 @@ glapi/glapi-stamp:
 
 subdirs: glapi/glapi-stamp
        $(MAKE) -C $(MESA) asm_subdirs
+       $(MAKE) -C $(MESA) glsl_builtin
 
 # remove generated sources because "depend" is checked even when "make clean"
 DEPEND_SOURCES := $(filter-out $(GENERATED_SOURCES), $(ES1_ALL_SOURCES) $(ES2_ALL_SOURCES))

diff --git a/src/mesa/es/main/get_gen.py b/src/mesa/es/main/get_gen.py
index fee6670..b820157 100644 (file)
--- a/src/mesa/es/main/get_gen.py
+++ b/src/mesa/es/main/get_gen.py
@@ -209,9 +209,9 @@ StateVars_common = [
 
        # GL_OES_read_format
        ( "GL_IMPLEMENTATION_COLOR_READ_TYPE_OES", GLint,
-         ["ctx->Const.ColorReadType"], "", None),
+         ["_mesa_get_color_read_type(ctx)"], "", ["OES_read_format"] ),
        ( "GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES", GLint,
-         ["ctx->Const.ColorReadFormat"], "", None),
+         ["_mesa_get_color_read_format(ctx)"], "", ["OES_read_format"] ),
 
        # GL_OES_framebuffer_object
        ( "GL_FRAMEBUFFER_BINDING_EXT", GLint, ["ctx->DrawBuffer->Name"], "",
@@ -655,6 +655,7 @@ def EmitHeader():
 #include "main/mtypes.h"
 #include "main/state.h"
 #include "main/texcompress.h"
+#include "main/framebuffer.h"
 
 
 /* ES1 tokens that should be in gl.h but aren't */