diff options
author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-06-09 22:10:10 -0400 |
---|---|---|
committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-06-18 12:51:55 -0400 |
commit | 78506ad2466563d9ec3f8d09a746a069e6cab6b5 (patch) | |
tree | 20bf7b4b2a0afd6ef959737854e5cc270703f408 /src | |
parent | b214e0d2fb736afcc6eb222a29a4d2fad31acacf (diff) |
glapi: add GL_EXT_window_rectangles entrypoints
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/mapi/glapi/gen/EXT_window_rectangles.xml | 29 | ||||
-rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 1 | ||||
-rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 | ||||
-rw-r--r-- | src/mesa/main/scissor.c | 7 | ||||
-rw-r--r-- | src/mesa/main/scissor.h | 3 | ||||
-rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 6 |
6 files changed, 48 insertions, 0 deletions
diff --git a/src/mapi/glapi/gen/EXT_window_rectangles.xml b/src/mapi/glapi/gen/EXT_window_rectangles.xml new file mode 100644 index 00000000000..7c85e55cf29 --- /dev/null +++ b/src/mapi/glapi/gen/EXT_window_rectangles.xml @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<OpenGLAPI> + +<category name="GL_EXT_window_rectangles" number="490"> + <enum name="INCLUSIVE_EXT" value="0x8F10"/> + <enum name="EXCLUSIVE_EXT" value="0x8F11"/> + <enum name="WINDOW_RECTANGLE_EXT" value="0x8F12" count="4"> + <size name="Get" mode="get"/> + </enum> + <enum name="WINDOW_RECTANGLE_MODE_EXT" value="0x8F13"> + <size name="Get" mode="get"/> + </enum> + <enum name="MAX_WINDOW_RECTANGLES_EXT" value="0x8F14"> + <size name="Get" mode="get"/> + </enum> + <enum name="NUM_WINDOW_RECTANGLES_EXT" value="0x8F15"> + <size name="Get" mode="get"/> + </enum> + + <function name="WindowRectanglesEXT" es2="3.0"> + <param name="mode" type="GLenum"/> + <param name="count" type="GLsizei"/> + <param name="box" type="const GLint *"/> + </function> +</category> + +</OpenGLAPI> diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index c511de932eb..0d7c3385d2e 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -188,6 +188,7 @@ API_XML = \ EXT_texture_array.xml \ EXT_texture_integer.xml \ EXT_transform_feedback.xml \ + EXT_window_rectangles.xml \ GREMEDY_string_marker.xml \ INTEL_performance_query.xml \ KHR_debug.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 766fe3c8098..79e1ba17c31 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -12758,6 +12758,8 @@ </function> </category> +<xi:include href="EXT_window_rectangles.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <!-- Unnumbered extensions sorted by name. --> <category name="GL_ATI_blend_equation_separate"> diff --git a/src/mesa/main/scissor.c b/src/mesa/main/scissor.c index bc8224c7d23..2b568e4926b 100644 --- a/src/mesa/main/scissor.c +++ b/src/mesa/main/scissor.c @@ -210,6 +210,13 @@ _mesa_ScissorIndexedv(GLuint index, const GLint *v) ScissorIndexed(index, v[0], v[1], v[2], v[3], "glScissorIndexedv"); } +void GLAPIENTRY +_mesa_WindowRectanglesEXT(GLenum mode, GLsizei count, const GLint *box) +{ + +} + + /** * Initialize the context's scissor state. * \param ctx the GL context. diff --git a/src/mesa/main/scissor.h b/src/mesa/main/scissor.h index 5f9a9945a99..1d0fac877b3 100644 --- a/src/mesa/main/scissor.h +++ b/src/mesa/main/scissor.h @@ -43,6 +43,9 @@ _mesa_ScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsi extern void GLAPIENTRY _mesa_ScissorIndexedv(GLuint index, const GLint * v); +extern void GLAPIENTRY +_mesa_WindowRectanglesEXT(GLenum mode, GLsizei count, const GLint *box); + extern void _mesa_set_scissor(struct gl_context *ctx, unsigned idx, GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index e81aaa26064..ee3c3d4abe7 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -952,6 +952,9 @@ const struct function common_desktop_functions_possible[] = { /* GL_GREMEDY_string_marker */ { "glStringMarkerGREMEDY", 15, -1 }, + /* GL_EXT_window_rectangles */ + { "glWindowRectanglesEXT", 30, -1 }, + { NULL, 0, -1 } }; @@ -2494,6 +2497,9 @@ const struct function gles3_functions_possible[] = { { "glDrawElementsInstancedBaseInstanceEXT", 30, -1 }, { "glDrawElementsInstancedBaseVertexBaseInstanceEXT", 30, -1 }, + /* GL_EXT_window_rectangles */ + { "glWindowRectanglesEXT", 30, -1 }, + { NULL, 0, -1 } }; |