diff options
author | Chia-I Wu <olvaffe@gmail.com> | 2010-02-07 20:22:08 +0800 |
---|---|---|
committer | Chia-I Wu <olvaffe@gmail.com> | 2010-02-07 20:24:05 +0800 |
commit | 8550c7f01e0ebe1f0dec5dcee4ce7fafbe73da95 (patch) | |
tree | 5cd04fe484560f6bcdc884f8b4bdc5450b05aae1 /sample-implementation-tmp/0006-winsys-xlib-st-es-Advertise-st_api.h-support.patch | |
parent | 0dccfa6e51242d6e96ce8e7ad1a14720527bceba (diff) |
Update SI again with experimental OpenGL support.
Diffstat (limited to 'sample-implementation-tmp/0006-winsys-xlib-st-es-Advertise-st_api.h-support.patch')
-rw-r--r-- | sample-implementation-tmp/0006-winsys-xlib-st-es-Advertise-st_api.h-support.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/sample-implementation-tmp/0006-winsys-xlib-st-es-Advertise-st_api.h-support.patch b/sample-implementation-tmp/0006-winsys-xlib-st-es-Advertise-st_api.h-support.patch new file mode 100644 index 0000000..8229027 --- /dev/null +++ b/sample-implementation-tmp/0006-winsys-xlib-st-es-Advertise-st_api.h-support.patch @@ -0,0 +1,79 @@ +From 7a244a27fa8613acfb67d1e8cf08909136d2b4b3 Mon Sep 17 00:00:00 2001 +From: Chia-I Wu <olv@lunarg.com> +Date: Sun, 7 Feb 2010 20:17:48 +0800 +Subject: [PATCH 6/6] winsys/xlib, st/es: Advertise st_api.h support. + +--- + src/gallium/state_trackers/es/Makefile | 1 + + src/gallium/state_trackers/es/st_es1.c | 6 ++++++ + src/gallium/state_trackers/es/st_es2.c | 6 ++++++ + src/gallium/winsys/xlib/xlib.c | 6 ++++++ + 4 files changed, 19 insertions(+), 0 deletions(-) + +diff --git a/src/gallium/state_trackers/es/Makefile b/src/gallium/state_trackers/es/Makefile +index b036551..e33685d 100644 +--- a/src/gallium/state_trackers/es/Makefile ++++ b/src/gallium/state_trackers/es/Makefile +@@ -38,6 +38,7 @@ SYS_LIBS = -lm -pthread + + + INCLUDE_DIRS = \ ++ -I$(TOP)/src/mesa \ + -I$(TOP)/src/gallium/include + + .c.o: +diff --git a/src/gallium/state_trackers/es/st_es1.c b/src/gallium/state_trackers/es/st_es1.c +index 25bc53b..eb4d129 100644 +--- a/src/gallium/state_trackers/es/st_es1.c ++++ b/src/gallium/state_trackers/es/st_es1.c +@@ -1,3 +1,9 @@ + #include "pipe/p_compiler.h" ++#include "state_tracker/gl_api.h" + + PUBLIC const int st_api_OpenGL_ES1 = 1; ++ ++PUBLIC const struct st_module st_module_OpenGL_ES1 = { ++ .api = ST_API_OPENGL_ES1, ++ .create_api = st_module_create_api ++}; +diff --git a/src/gallium/state_trackers/es/st_es2.c b/src/gallium/state_trackers/es/st_es2.c +index 171ea62..25626b7 100644 +--- a/src/gallium/state_trackers/es/st_es2.c ++++ b/src/gallium/state_trackers/es/st_es2.c +@@ -1,3 +1,9 @@ + #include "pipe/p_compiler.h" ++#include "state_tracker/gl_api.h" + + PUBLIC const int st_api_OpenGL_ES2 = 1; ++ ++PUBLIC const struct st_module st_module_OpenGL_ES2 = { ++ .api = ST_API_OPENGL_ES2, ++ .create_api = st_module_create_api ++}; +diff --git a/src/gallium/winsys/xlib/xlib.c b/src/gallium/winsys/xlib/xlib.c +index 67617a4..fd66e2b 100644 +--- a/src/gallium/winsys/xlib/xlib.c ++++ b/src/gallium/winsys/xlib/xlib.c +@@ -36,6 +36,7 @@ + + #include <stdlib.h> + #include <assert.h> ++#include "state_tracker/gl_api.h" + + /* Todo, replace all this with callback-structs provided by the + * individual implementations. +@@ -50,6 +51,11 @@ enum mode { + /* advertise OpenGL support */ + PUBLIC const int st_api_OpenGL = 1; + ++PUBLIC const struct st_module st_module_OpenGL = { ++ .api = ST_API_OPENGL, ++ .create_api = st_module_create_api ++}; ++ + static enum mode get_mode() + { + #ifdef GALLIUM_CELL +-- +1.6.4.3 + |