AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/es: Fix build issue after merge.

Browse Source 
In cd6b8dd9e8, color read/type fields are
moved;  Based on 068596c9a7 and
cc020425e9, GLSL builtin library is
autogenerated and GLSL libraries are built and used.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
This commit is contained in:
Chia-I Wu
2010-01-05 15:57:13 +08:00
parent 562c127693
commit bffe94d48a
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/linux-opengl-es
+1 -1
View File
@@ -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
src/mesa/es/Makefile
+11 -10
View File
@@ -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))
src/mesa/es/main/get_gen.py
+3 -2
View File
@@ -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 */