diff options
Diffstat (limited to 'src/mesa/es')
-rw-r--r-- | src/mesa/es/glapi/Makefile | 2 | ||||
-rw-r--r-- | src/mesa/es/glapi/base1_API.xml | 2 | ||||
-rw-r--r-- | src/mesa/es/glapi/base2_API.xml | 2 | ||||
-rw-r--r-- | src/mesa/es/glapi/es1_API.xml | 2 | ||||
-rw-r--r-- | src/mesa/es/glapi/es1_COMPAT.xml | 2 | ||||
-rw-r--r-- | src/mesa/es/glapi/es1_EXT.xml | 2 | ||||
-rw-r--r-- | src/mesa/es/glapi/es2_API.xml | 2 | ||||
-rw-r--r-- | src/mesa/es/glapi/es2_COMPAT.xml | 2 | ||||
-rw-r--r-- | src/mesa/es/glapi/es2_EXT.xml | 2 | ||||
-rw-r--r-- | src/mesa/es/glapi/es_COMPAT.xml | 4 | ||||
-rw-r--r-- | src/mesa/es/glapi/es_EXT.xml | 5 | ||||
-rw-r--r-- | src/mesa/es/glapi/gl_compare.py | 2 | ||||
-rw-r--r-- | src/mesa/es/glapi/gl_parse_header.py | 2 | ||||
-rw-r--r-- | src/mesa/es/main/APIspec.xml | 39 | ||||
-rw-r--r-- | src/mesa/es/main/drawtex.c | 2 | ||||
-rw-r--r-- | src/mesa/es/main/es_generator.py | 2 | ||||
-rw-r--r-- | src/mesa/es/main/mfeatures_es1.h | 2 | ||||
-rw-r--r-- | src/mesa/es/main/mfeatures_es2.h | 2 | ||||
-rw-r--r-- | src/mesa/es/main/specials_es1.c | 2 | ||||
-rw-r--r-- | src/mesa/es/main/specials_es2.c | 2 |
20 files changed, 64 insertions, 18 deletions
diff --git a/src/mesa/es/glapi/Makefile b/src/mesa/es/glapi/Makefile index 1e32af867d..e8a9afab7c 100644 --- a/src/mesa/es/glapi/Makefile +++ b/src/mesa/es/glapi/Makefile @@ -1,5 +1,5 @@ TOP = ../../../.. -GLAPI = ../../glapi +GLAPI = ../../glapi/gen include $(TOP)/configs/current OUTPUTS := \ diff --git a/src/mesa/es/glapi/base1_API.xml b/src/mesa/es/glapi/base1_API.xml index f5d136ccef..72e4128272 100644 --- a/src/mesa/es/glapi/base1_API.xml +++ b/src/mesa/es/glapi/base1_API.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd"> +<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd"> <!-- OpenGL and OpenGL ES 1.x APIs This file defines the base categories that can be shared by all APIs. diff --git a/src/mesa/es/glapi/base2_API.xml b/src/mesa/es/glapi/base2_API.xml index 6aa43b728a..5657b8e775 100644 --- a/src/mesa/es/glapi/base2_API.xml +++ b/src/mesa/es/glapi/base2_API.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd"> +<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd"> <!-- OpenGL and OpenGL ES 2.x APIs --> diff --git a/src/mesa/es/glapi/es1_API.xml b/src/mesa/es/glapi/es1_API.xml index 7ee5515f19..1ac1467458 100644 --- a/src/mesa/es/glapi/es1_API.xml +++ b/src/mesa/es/glapi/es1_API.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd"> +<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd"> <!-- OpenGL ES 1.x API --> diff --git a/src/mesa/es/glapi/es1_COMPAT.xml b/src/mesa/es/glapi/es1_COMPAT.xml index 4fc9223cc0..1f45a8c0b6 100644 --- a/src/mesa/es/glapi/es1_COMPAT.xml +++ b/src/mesa/es/glapi/es1_COMPAT.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd"> +<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd"> <OpenGLAPI> diff --git a/src/mesa/es/glapi/es1_EXT.xml b/src/mesa/es/glapi/es1_EXT.xml index de4868cfd4..d4abd81046 100644 --- a/src/mesa/es/glapi/es1_EXT.xml +++ b/src/mesa/es/glapi/es1_EXT.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd"> +<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd"> <!-- OpenGL ES 1.x extensions --> diff --git a/src/mesa/es/glapi/es2_API.xml b/src/mesa/es/glapi/es2_API.xml index 266c07613c..b476dbe00f 100644 --- a/src/mesa/es/glapi/es2_API.xml +++ b/src/mesa/es/glapi/es2_API.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd"> +<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd"> <!-- OpenGL ES 2.x API --> diff --git a/src/mesa/es/glapi/es2_COMPAT.xml b/src/mesa/es/glapi/es2_COMPAT.xml index 61f11a604e..5ecd4a1ba6 100644 --- a/src/mesa/es/glapi/es2_COMPAT.xml +++ b/src/mesa/es/glapi/es2_COMPAT.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd"> +<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd"> <OpenGLAPI> diff --git a/src/mesa/es/glapi/es2_EXT.xml b/src/mesa/es/glapi/es2_EXT.xml index 3615772b56..dcf9858569 100644 --- a/src/mesa/es/glapi/es2_EXT.xml +++ b/src/mesa/es/glapi/es2_EXT.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd"> +<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd"> <!-- OpenGL ES 2.x extensions --> diff --git a/src/mesa/es/glapi/es_COMPAT.xml b/src/mesa/es/glapi/es_COMPAT.xml index bb6d28db83..1bd66dad30 100644 --- a/src/mesa/es/glapi/es_COMPAT.xml +++ b/src/mesa/es/glapi/es_COMPAT.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd"> +<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd"> <OpenGLAPI> @@ -2641,6 +2641,6 @@ </function> </category> -<xi:include href="../../glapi/APPLE_vertex_array_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="../../glapi/gen/APPLE_vertex_array_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </OpenGLAPI> diff --git a/src/mesa/es/glapi/es_EXT.xml b/src/mesa/es/glapi/es_EXT.xml index b76cda929a..291a53b4b2 100644 --- a/src/mesa/es/glapi/es_EXT.xml +++ b/src/mesa/es/glapi/es_EXT.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd"> +<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd"> <!-- OpenGL ES extensions --> @@ -18,6 +18,9 @@ <enum name="PALETTE8_RGB5_A1_OES" value="0x8B99"/> </category> +<!-- 23. GL_OES_EGL_image --> +<xi:include href="../../glapi/gen/OES_EGL_image.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <category name="GL_OES_depth24" number="24"> <enum name="DEPTH_COMPONENT24_OES" value="0x81A6"/> </category> diff --git a/src/mesa/es/glapi/gl_compare.py b/src/mesa/es/glapi/gl_compare.py index 7a2148cb1f..6b5e43bb98 100644 --- a/src/mesa/es/glapi/gl_compare.py +++ b/src/mesa/es/glapi/gl_compare.py @@ -25,7 +25,7 @@ import sys import os.path import getopt -GLAPI = "../../glapi" +GLAPI = "../../glapi/gen" sys.path.append(GLAPI) import gl_XML diff --git a/src/mesa/es/glapi/gl_parse_header.py b/src/mesa/es/glapi/gl_parse_header.py index 8b8d16b395..5382eba35c 100644 --- a/src/mesa/es/glapi/gl_parse_header.py +++ b/src/mesa/es/glapi/gl_parse_header.py @@ -26,7 +26,7 @@ import os.path import getopt import re -GLAPI = "../../glapi" +GLAPI = "../../glapi/gen" sys.path.append(GLAPI) class HeaderParser(object): diff --git a/src/mesa/es/main/APIspec.xml b/src/mesa/es/main/APIspec.xml index f6f33130b1..17665d8df5 100644 --- a/src/mesa/es/main/APIspec.xml +++ b/src/mesa/es/main/APIspec.xml @@ -3502,6 +3502,31 @@ </desc> </template> +<template name="EGLImageTargetTexture2D"> + <proto> + <return type="void"/> + <param name="target" type="GLenum"/> + <param name="image" type="GLeglImageOES"/> + </proto> + + <desc name="target"> + <value name="GL_TEXTURE_2D"/> + </desc> +</template> + +<template name="EGLImageTargetRenderbufferStorage"> + <proto> + <return type="void"/> + <param name="target" type="GLenum"/> + <param name="image" type="GLeglImageOES"/> + </proto> + + <desc name="target"> + <value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/> + <value name="GL_RENDERBUFFER" category="GLES2.0"/> + </desc> +</template> + <api name="mesa" implementation="true"> <category name="MESA"/> @@ -3770,6 +3795,10 @@ <!-- EXT_multi_draw_arrays --> <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/> <function name="MultiDrawElementsEXT" template="MultiDrawElements"/> + + <!-- OES_EGL_image --> + <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/> + <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/> </api> <api name="GLES1.1"> @@ -3811,6 +3840,7 @@ <category name="EXT_blend_minmax"/> --> <category name="EXT_multi_draw_arrays"/> + <category name="OES_EGL_image"/> <category name="OES_matrix_palette"/> @@ -4068,6 +4098,10 @@ <!-- EXT_multi_draw_arrays --> <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/> <function name="MultiDrawElementsEXT" template="MultiDrawElements"/> + + <!-- OES_EGL_image --> + <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/> + <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/> </api> <api name="GLES2.0"> @@ -4095,6 +4129,7 @@ <category name="EXT_blend_minmax"/> --> <category name="EXT_multi_draw_arrays"/> + <category name="OES_EGL_image"/> <function name="CullFace" template="CullFace"/> @@ -4292,6 +4327,10 @@ <!-- EXT_multi_draw_arrays --> <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/> <function name="MultiDrawElementsEXT" template="MultiDrawElements"/> + + <!-- OES_EGL_image --> + <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/> + <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/> </api> </apispec> diff --git a/src/mesa/es/main/drawtex.c b/src/mesa/es/main/drawtex.c index cbd41ca975..42f4409397 100644 --- a/src/mesa/es/main/drawtex.c +++ b/src/mesa/es/main/drawtex.c @@ -25,7 +25,7 @@ #include "main/state.h" #include "main/imports.h" -#include "glapi/dispatch.h" +#include "main/dispatch.h" #if FEATURE_OES_draw_texture diff --git a/src/mesa/es/main/es_generator.py b/src/mesa/es/main/es_generator.py index 590f5940a7..f736792dec 100644 --- a/src/mesa/es/main/es_generator.py +++ b/src/mesa/es/main/es_generator.py @@ -207,7 +207,7 @@ extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... ); #include "main/compiler.h" #include "main/api_exec.h" -#include "glapi/dispatch.h" +#include "main/dispatch.h" typedef void (*_glapi_proc)(void); /* generic function pointer */ """ diff --git a/src/mesa/es/main/mfeatures_es1.h b/src/mesa/es/main/mfeatures_es1.h index 6c2ece2608..1793550268 100644 --- a/src/mesa/es/main/mfeatures_es1.h +++ b/src/mesa/es/main/mfeatures_es1.h @@ -106,6 +106,8 @@ #define FEATURE_OES_draw_texture 1 #define FEATURE_OES_mapbuffer 1 +#define FEATURE_OES_EGL_image 1 + #define FEATURE_extra_context_init 1 /*@}*/ diff --git a/src/mesa/es/main/mfeatures_es2.h b/src/mesa/es/main/mfeatures_es2.h index f34782fedb..a463bed11c 100644 --- a/src/mesa/es/main/mfeatures_es2.h +++ b/src/mesa/es/main/mfeatures_es2.h @@ -106,6 +106,8 @@ #define FEATURE_OES_draw_texture 0 #define FEATURE_OES_mapbuffer 1 +#define FEATURE_OES_EGL_image 1 + #define FEATURE_extra_context_init 1 /*@}*/ diff --git a/src/mesa/es/main/specials_es1.c b/src/mesa/es/main/specials_es1.c index a4f14490f3..c842007c22 100644 --- a/src/mesa/es/main/specials_es1.c +++ b/src/mesa/es/main/specials_es1.c @@ -167,7 +167,7 @@ compute_es_extensions(void) unsigned int len; len = make_extension_string(ctx, NULL); - s = (char *) _mesa_malloc(len + 1); + s = (char *) malloc(len + 1); if (!s) return NULL; make_extension_string(ctx, s); diff --git a/src/mesa/es/main/specials_es2.c b/src/mesa/es/main/specials_es2.c index e11ade9b94..10b4f25e0f 100644 --- a/src/mesa/es/main/specials_es2.c +++ b/src/mesa/es/main/specials_es2.c @@ -138,7 +138,7 @@ compute_es_extensions(void) unsigned int len; len = make_extension_string(ctx, NULL); - s = (char *) _mesa_malloc(len + 1); + s = (char *) malloc(len + 1); if (!s) return NULL; make_extension_string(ctx, s); |