Enable GL_OES_viewport_array in GL generation scripts

The actual change was in scripts/opengl/src_util.py
everything else was auto-generated.

Change-Id: Id9a18188f0e3f0d4eb7c6495adc50b6ae439582a

diff --git a/framework/opengl/gluCallLogWrapper.inl b/framework/opengl/gluCallLogWrapper.inl
index 4f2bcd368a17f7d2787acefa270c052238ef9519..7638da418db5d4384347eb77e4136c4fb84e8995 100644 (file)
--- a/framework/opengl/gluCallLogWrapper.inl
+++ b/framework/opengl/gluCallLogWrapper.inl
@@ -1072,6 +1072,13 @@ void CallLogWrapper::glDepthRange (glw::GLdouble near, glw::GLdouble far)
        m_gl.depthRange(near, far);
 }
 
+void CallLogWrapper::glDepthRangeArrayfvOES (glw::GLuint first, glw::GLsizei count, const glw::GLfloat *v)
+{
+       if (m_enableLog)
+               m_log << TestLog::Message << "glDepthRangeArrayfvOES(" << first << ", " << count << ", " << toHex(reinterpret_cast<deUintptr>(static_cast<const void*>(v))) << ");" << TestLog::EndMessage;
+       m_gl.depthRangeArrayfvOES(first, count, v);
+}
+
 void CallLogWrapper::glDepthRangeArrayv (glw::GLuint first, glw::GLsizei count, const glw::GLdouble *v)
 {
        if (m_enableLog)
@@ -1086,6 +1093,13 @@ void CallLogWrapper::glDepthRangeIndexed (glw::GLuint index, glw::GLdouble n, gl
        m_gl.depthRangeIndexed(index, n, f);
 }
 
+void CallLogWrapper::glDepthRangeIndexedfOES (glw::GLuint index, glw::GLfloat n, glw::GLfloat f)
+{
+       if (m_enableLog)
+               m_log << TestLog::Message << "glDepthRangeIndexedfOES(" << index << ", " << n << ", " << f << ");" << TestLog::EndMessage;
+       m_gl.depthRangeIndexedfOES(index, n, f);
+}
+
 void CallLogWrapper::glDepthRangef (glw::GLfloat n, glw::GLfloat f)
 {
        if (m_enableLog)

diff --git a/framework/opengl/gluCallLogWrapperApi.inl b/framework/opengl/gluCallLogWrapperApi.inl
index 9cba36966cb72f5c3e497e681d11737a7ac9c671..8fb29b9d109ea373e5a6b26718c4c5f7071b8e1a 100644 (file)
--- a/framework/opengl/gluCallLogWrapperApi.inl
+++ b/framework/opengl/gluCallLogWrapperApi.inl
@@ -153,8 +153,10 @@ void                                       glDeleteVertexArrays                                                            (glw::GLsizei n, const glw::GLuint *arrays)
 void                                   glDepthFunc                                                                                     (glw::GLenum func);
 void                                   glDepthMask                                                                                     (glw::GLboolean flag);
 void                                   glDepthRange                                                                            (glw::GLdouble near, glw::GLdouble far);
+void                                   glDepthRangeArrayfvOES                                                          (glw::GLuint first, glw::GLsizei count, const glw::GLfloat *v);
 void                                   glDepthRangeArrayv                                                                      (glw::GLuint first, glw::GLsizei count, const glw::GLdouble *v);
 void                                   glDepthRangeIndexed                                                                     (glw::GLuint index, glw::GLdouble n, glw::GLdouble f);
+void                                   glDepthRangeIndexedfOES                                                         (glw::GLuint index, glw::GLfloat n, glw::GLfloat f);
 void                                   glDepthRangef                                                                           (glw::GLfloat n, glw::GLfloat f);
 void                                   glDetachShader                                                                          (glw::GLuint program, glw::GLuint shader);
 void                                   glDisable                                                                                       (glw::GLenum cap);

diff --git a/framework/opengl/wrapper/glwApi.inl b/framework/opengl/wrapper/glwApi.inl
index 6ec31b8cb6e864072dc244cd7704515da7e66722..2daf2a2c64dc914e1d8334fcbbf551141ca677a4 100644 (file)
--- a/framework/opengl/wrapper/glwApi.inl
+++ b/framework/opengl/wrapper/glwApi.inl
@@ -153,8 +153,10 @@
 #define                        glDepthFunc                                                                                     glwDepthFunc
 #define                        glDepthMask                                                                                     glwDepthMask
 #define                        glDepthRange                                                                            glwDepthRange
+#define                        glDepthRangeArrayfvOES                                                          glwDepthRangeArrayfvOES
 #define                        glDepthRangeArrayv                                                                      glwDepthRangeArrayv
 #define                        glDepthRangeIndexed                                                                     glwDepthRangeIndexed
+#define                        glDepthRangeIndexedfOES                                                         glwDepthRangeIndexedfOES
 #define                        glDepthRangef                                                                           glwDepthRangef
 #define                        glDetachShader                                                                          glwDetachShader
 #define                        glDisable                                                                                       glwDisable
@@ -987,8 +989,10 @@ void                       glwDeleteVertexArrays                                                           (GLsizei n, const GLuint *arrays);
 void                   glwDepthFunc                                                                            (GLenum func);
 void                   glwDepthMask                                                                            (GLboolean flag);
 void                   glwDepthRange                                                                           (GLdouble near, GLdouble far);
+void                   glwDepthRangeArrayfvOES                                                         (GLuint first, GLsizei count, const GLfloat *v);
 void                   glwDepthRangeArrayv                                                                     (GLuint first, GLsizei count, const GLdouble *v);
 void                   glwDepthRangeIndexed                                                            (GLuint index, GLdouble n, GLdouble f);
+void                   glwDepthRangeIndexedfOES                                                        (GLuint index, GLfloat n, GLfloat f);
 void                   glwDepthRangef                                                                          (GLfloat n, GLfloat f);
 void                   glwDetachShader                                                                         (GLuint program, GLuint shader);
 void                   glwDisable                                                                                      (GLenum cap);

diff --git a/framework/opengl/wrapper/glwEnums.inl b/framework/opengl/wrapper/glwEnums.inl
index fce71de67be891739a15571fc44597c9cabe10ac..f6cf7de1805d9ce428dcccc287ce5c56550861dd 100644 (file)
--- a/framework/opengl/wrapper/glwEnums.inl
+++ b/framework/opengl/wrapper/glwEnums.inl
@@ -467,11 +467,15 @@
 #define GL_ACTIVE_PROGRAM                                                                                              0x8259
 #define GL_PROGRAM_PIPELINE_BINDING                                                                            0x825A
 #define GL_MAX_VIEWPORTS                                                                                               0x825B
+#define GL_MAX_VIEWPORTS_OES                                                                                   0x825B
 #define GL_VIEWPORT_SUBPIXEL_BITS                                                                              0x825C
+#define GL_VIEWPORT_SUBPIXEL_BITS_OES                                                                  0x825C
 #define GL_VIEWPORT_BOUNDS_RANGE                                                                               0x825D
+#define GL_VIEWPORT_BOUNDS_RANGE_OES                                                                   0x825D
 #define GL_LAYER_PROVOKING_VERTEX                                                                              0x825E
 #define GL_LAYER_PROVOKING_VERTEX_EXT                                                                  0x825E
 #define GL_VIEWPORT_INDEX_PROVOKING_VERTEX                                                             0x825F
+#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX_OES                                                 0x825F
 #define GL_UNDEFINED_VERTEX                                                                                            0x8260
 #define GL_UNDEFINED_VERTEX_EXT                                                                                        0x8260
 #define GL_NO_RESET_NOTIFICATION                                                                               0x8261

diff --git a/framework/opengl/wrapper/glwFunctionTypes.inl b/framework/opengl/wrapper/glwFunctionTypes.inl
index 1836e5d4b6d3225c4d94e1832056e4b704ce7f0b..9b23db2849c807a5b5928685aab4d6c4d9181202 100644 (file)
--- a/framework/opengl/wrapper/glwFunctionTypes.inl
+++ b/framework/opengl/wrapper/glwFunctionTypes.inl
@@ -153,8 +153,10 @@ typedef GLW_APICALL void                   (GLW_APIENTRY* glDeleteVertexArraysFunc)                                                                (GLsi
 typedef GLW_APICALL void                       (GLW_APIENTRY* glDepthFuncFunc)                                                                                 (GLenum func);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glDepthMaskFunc)                                                                                 (GLboolean flag);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glDepthRangeFunc)                                                                                (GLdouble near, GLdouble far);
+typedef GLW_APICALL void                       (GLW_APIENTRY* glDepthRangeArrayfvOESFunc)                                                              (GLuint first, GLsizei count, const GLfloat *v);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glDepthRangeArrayvFunc)                                                                  (GLuint first, GLsizei count, const GLdouble *v);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glDepthRangeIndexedFunc)                                                                 (GLuint index, GLdouble n, GLdouble f);
+typedef GLW_APICALL void                       (GLW_APIENTRY* glDepthRangeIndexedfOESFunc)                                                             (GLuint index, GLfloat n, GLfloat f);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glDepthRangefFunc)                                                                               (GLfloat n, GLfloat f);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glDetachShaderFunc)                                                                              (GLuint program, GLuint shader);
 typedef GLW_APICALL void                       (GLW_APIENTRY* glDisableFunc)                                                                                   (GLenum cap);

diff --git a/framework/opengl/wrapper/glwFunctions.inl b/framework/opengl/wrapper/glwFunctions.inl
index b84d05a460ddf82712c6bd3facc4622792c8e3b6..55f46a6d270a2078b113b3c453c7899e6efe529c 100644 (file)
--- a/framework/opengl/wrapper/glwFunctions.inl
+++ b/framework/opengl/wrapper/glwFunctions.inl
@@ -153,8 +153,10 @@ glDeleteVertexArraysFunc                                                           deleteVertexArrays;
 glDepthFuncFunc                                                                                        depthFunc;
 glDepthMaskFunc                                                                                        depthMask;
 glDepthRangeFunc                                                                               depthRange;
+glDepthRangeArrayfvOESFunc                                                             depthRangeArrayfvOES;
 glDepthRangeArrayvFunc                                                                 depthRangeArrayv;
 glDepthRangeIndexedFunc                                                                        depthRangeIndexed;
+glDepthRangeIndexedfOESFunc                                                            depthRangeIndexedfOES;
 glDepthRangefFunc                                                                              depthRangef;
 glDetachShaderFunc                                                                             detachShader;
 glDisableFunc                                                                                  disable;

diff --git a/framework/opengl/wrapper/glwImpl.inl b/framework/opengl/wrapper/glwImpl.inl
index 74456dbc7015a58b83a21c682de159e1b45b236e..d75a0d8fb4fcba5da3b8d25e5174fae6ebea8063 100644 (file)
--- a/framework/opengl/wrapper/glwImpl.inl
+++ b/framework/opengl/wrapper/glwImpl.inl
@@ -1204,6 +1204,14 @@ void glwDepthRange (GLdouble near, GLdouble far)
        gl->depthRange(near, far);
 }
 
+void glwDepthRangeArrayfvOES (GLuint first, GLsizei count, const GLfloat *v)
+{
+       const glw::Functions* gl = glw::getCurrentThreadFunctions();
+       if (!gl)
+               return;
+       gl->depthRangeArrayfvOES(first, count, v);
+}
+
 void glwDepthRangeArrayv (GLuint first, GLsizei count, const GLdouble *v)
 {
        const glw::Functions* gl = glw::getCurrentThreadFunctions();
@@ -1220,6 +1228,14 @@ void glwDepthRangeIndexed (GLuint index, GLdouble n, GLdouble f)
        gl->depthRangeIndexed(index, n, f);
 }
 
+void glwDepthRangeIndexedfOES (GLuint index, GLfloat n, GLfloat f)
+{
+       const glw::Functions* gl = glw::getCurrentThreadFunctions();
+       if (!gl)
+               return;
+       gl->depthRangeIndexedfOES(index, n, f);
+}
+
 void glwDepthRangef (GLfloat n, GLfloat f)
 {
        const glw::Functions* gl = glw::getCurrentThreadFunctions();

diff --git a/framework/opengl/wrapper/glwInitExtES.inl b/framework/opengl/wrapper/glwInitExtES.inl
index 30900eb0046dad3350c2c15b9f95d3670e24a28e..1430e8797fbad226d26d1dfce00734b2b9d5f8b8 100644 (file)
--- a/framework/opengl/wrapper/glwInitExtES.inl
+++ b/framework/opengl/wrapper/glwInitExtES.inl
@@ -149,6 +149,22 @@ if (de::contains(extSet, "GL_OES_vertex_array_object"))
        gl->isVertexArray               = (glIsVertexArrayFunc)                 loader->get("glIsVertexArrayOES");
 }
 
+if (de::contains(extSet, "GL_OES_viewport_array"))
+{
+       gl->depthRangeArrayfvOES        = (glDepthRangeArrayfvOESFunc)  loader->get("glDepthRangeArrayfvOES");
+       gl->depthRangeIndexedfOES       = (glDepthRangeIndexedfOESFunc) loader->get("glDepthRangeIndexedfOES");
+       gl->disablei                            = (glDisableiFunc)                              loader->get("glDisableiOES");
+       gl->enablei                                     = (glEnableiFunc)                               loader->get("glEnableiOES");
+       gl->getFloati_v                         = (glGetFloati_vFunc)                   loader->get("glGetFloati_vOES");
+       gl->isEnabledi                          = (glIsEnablediFunc)                    loader->get("glIsEnablediOES");
+       gl->scissorArrayv                       = (glScissorArrayvFunc)                 loader->get("glScissorArrayvOES");
+       gl->scissorIndexed                      = (glScissorIndexedFunc)                loader->get("glScissorIndexedOES");
+       gl->scissorIndexedv                     = (glScissorIndexedvFunc)               loader->get("glScissorIndexedvOES");
+       gl->viewportArrayv                      = (glViewportArrayvFunc)                loader->get("glViewportArrayvOES");
+       gl->viewportIndexedf            = (glViewportIndexedfFunc)              loader->get("glViewportIndexedfOES");
+       gl->viewportIndexedfv           = (glViewportIndexedfvFunc)             loader->get("glViewportIndexedfvOES");
+}
+
 if (de::contains(extSet, "GL_NV_internalformat_sample_query"))
 {
        gl->getInternalformatSampleivNV = (glGetInternalformatSampleivNVFunc)   loader->get("glGetInternalformatSampleivNV");

diff --git a/framework/platform/null/tcuNullRenderContextFuncs.inl b/framework/platform/null/tcuNullRenderContextFuncs.inl
index a5065df0dbf3be92159d76a929660802b938342d..bca22288d8510413bb2c70e71fe9a46d14d2342e 100644 (file)
--- a/framework/platform/null/tcuNullRenderContextFuncs.inl
+++ b/framework/platform/null/tcuNullRenderContextFuncs.inl
@@ -1431,6 +1431,14 @@ GLW_APICALL void GLW_APIENTRY glDepthRange (GLdouble near, GLdouble far)
 
 }
 
+GLW_APICALL void GLW_APIENTRY glDepthRangeArrayfvOES (GLuint first, GLsizei count, const GLfloat *v)
+{
+       DE_UNREF(first);
+       DE_UNREF(count);
+       DE_UNREF(v);
+
+}
+
 GLW_APICALL void GLW_APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLdouble *v)
 {
        DE_UNREF(first);
@@ -1447,6 +1455,14 @@ GLW_APICALL void GLW_APIENTRY glDepthRangeIndexed (GLuint index, GLdouble n, GLd
 
 }
 
+GLW_APICALL void GLW_APIENTRY glDepthRangeIndexedfOES (GLuint index, GLfloat n, GLfloat f)
+{
+       DE_UNREF(index);
+       DE_UNREF(n);
+       DE_UNREF(f);
+
+}
+
 GLW_APICALL void GLW_APIENTRY glDepthRangef (GLfloat n, GLfloat f)
 {
        DE_UNREF(n);

diff --git a/framework/platform/null/tcuNullRenderContextInitFuncs.inl b/framework/platform/null/tcuNullRenderContextInitFuncs.inl
index 9f7d67ac7956b15dd9136586eae6c548adb899b7..9a337704f52340ef79744d128ce9b82a74defa76 100644 (file)
--- a/framework/platform/null/tcuNullRenderContextInitFuncs.inl
+++ b/framework/platform/null/tcuNullRenderContextInitFuncs.inl
@@ -153,8 +153,10 @@ gl->deleteVertexArrays                                                             = glDeleteVertexArrays;
 gl->depthFunc                                                                          = glDepthFunc;
 gl->depthMask                                                                          = glDepthMask;
 gl->depthRange                                                                         = glDepthRange;
+gl->depthRangeArrayfvOES                                                       = glDepthRangeArrayfvOES;
 gl->depthRangeArrayv                                                           = glDepthRangeArrayv;
 gl->depthRangeIndexed                                                          = glDepthRangeIndexed;
+gl->depthRangeIndexedfOES                                                      = glDepthRangeIndexedfOES;
 gl->depthRangef                                                                                = glDepthRangef;
 gl->detachShader                                                                       = glDetachShader;
 gl->disable                                                                                    = glDisable;

diff --git a/scripts/opengl/src_util.py b/scripts/opengl/src_util.py
index 83141e0358b2398e103d12e2b31a2464fa1e1fe3..30aa7d923ae952fd05d09e62d749849a8464f460 100644 (file)
--- a/scripts/opengl/src_util.py
+++ b/scripts/opengl/src_util.py
@@ -82,6 +82,7 @@ EXTENSIONS                    = [
        'GL_OES_stencil4',
        'GL_OES_mapbuffer',
        'GL_OES_vertex_array_object',
+       'GL_OES_viewport_array',
        'GL_ARB_clip_control',
        'GL_ARB_buffer_storage',
        'GL_ARB_compute_shader',