From 97ea8e9263814634d2f718c82fb58464d20683f8 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 6 Nov 2009 16:27:19 +0800 Subject: Add new config for OpenGL ES. Signed-off-by: Chia-I Wu --- configs/linux-opengl-es | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 configs/linux-opengl-es (limited to 'configs') diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es new file mode 100644 index 0000000000..2ba94b61de --- /dev/null +++ b/configs/linux-opengl-es @@ -0,0 +1,21 @@ +# Configuration for OpenGL ES on Linux + +include $(TOP)/configs/linux + +CONFIG_NAME = linux-opengl-es + +# Directories to build +LIB_DIR = lib +SRC_DIRS = egl mesa/es gallium gallium/winsys +PROGRAM_DIRS = es1/xegl es2/xegl + +# no mesa or egl drivers +DRIVER_DIRS = +EGL_DRIVERS_DIRS = + +GALLIUM_DRIVERS_DIRS = softpipe + +# build egl_softpipe.so +GALLIUM_WINSYS_DIRS = egl_xlib +# and libGLES*.so +GALLIUM_STATE_TRACKERS_DIRS = es -- cgit v1.2.3 From 9f38553018552ccf85b390d63cb57c701bd233ad Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 10 Nov 2009 12:48:14 +0800 Subject: Update config linux-opengl-es. Build demos that require EGL_MESA_screen_surface, and build egl_i915.so that supports EGL_MESA_screen_surface. Signed-off-by: Chia-I Wu --- configs/linux-opengl-es | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es index 2ba94b61de..1254f0693d 100644 --- a/configs/linux-opengl-es +++ b/configs/linux-opengl-es @@ -7,7 +7,7 @@ CONFIG_NAME = linux-opengl-es # Directories to build LIB_DIR = lib SRC_DIRS = egl mesa/es gallium gallium/winsys -PROGRAM_DIRS = es1/xegl es2/xegl +PROGRAM_DIRS = es1/screen es1/xegl es2/xegl # no mesa or egl drivers DRIVER_DIRS = @@ -19,3 +19,9 @@ GALLIUM_DRIVERS_DIRS = softpipe GALLIUM_WINSYS_DIRS = egl_xlib # and libGLES*.so GALLIUM_STATE_TRACKERS_DIRS = es + +# build egl_i915.so +GALLIUM_DRIVERS_DIRS += trace i915 +GALLIUM_STATE_TRACKERS_DIRS += egl +GALLIUM_WINSYS_DIRS += drm +GALLIUM_WINSYS_DRM_DIRS = intel -- cgit v1.2.3 From bffe94d48ac70d1498581d80f2cb3be78ccc24f4 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 5 Jan 2010 15:57:13 +0800 Subject: 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 --- configs/linux-opengl-es | 2 +- src/mesa/es/Makefile | 21 +++++++++++---------- src/mesa/es/main/get_gen.py | 5 +++-- 3 files changed, 15 insertions(+), 13 deletions(-) (limited to 'configs') diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es index 1254f0693d..566cd758e3 100644 --- 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 6a4756c1b5..ca38dc4aed 100644 --- 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 fee6670104..b820157be0 100644 --- 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 */ -- cgit v1.2.3