mesa: enable ARB_viewport_array in compat profile

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/mapi/glapi/gen/apiexec.py b/src/mapi/glapi/gen/apiexec.py
index e69c6b4df1672a09fd92f190ad99d489743189a3..1a91785d37591f7f02f76aab14d8268ac86cbdff 100644 (file)
--- a/src/mapi/glapi/gen/apiexec.py
+++ b/src/mapi/glapi/gen/apiexec.py
@@ -131,14 +131,14 @@ functions = {
     #
     # Mesa does not support either of the geometry shader extensions, so
     # OpenGL 3.2 is required.
-    "ViewportArrayv": exec_info(core=32, es2=31),
-    "ViewportIndexedf": exec_info(core=32, es2=31),
-    "ViewportIndexedfv": exec_info(core=32, es2=31),
-    "ScissorArrayv": exec_info(core=32, es2=31),
-    "ScissorIndexed": exec_info(core=32, es2=31),
-    "ScissorIndexedv": exec_info(core=32, es2=31),
-    "DepthRangeArrayv": exec_info(core=32),
-    "DepthRangeIndexed": exec_info(core=32),
+    "ViewportArrayv": exec_info(compatibility=32, core=32, es2=31),
+    "ViewportIndexedf": exec_info(compatibility=32, core=32, es2=31),
+    "ViewportIndexedfv": exec_info(compatibility=32, core=32, es2=31),
+    "ScissorArrayv": exec_info(compatibility=32, core=32, es2=31),
+    "ScissorIndexed": exec_info(compatibility=32, core=32, es2=31),
+    "ScissorIndexedv": exec_info(compatibility=32, core=32, es2=31),
+    "DepthRangeArrayv": exec_info(compatibility=32, core=32),
+    "DepthRangeIndexed": exec_info(compatibility=32, core=32),
     # GetFloati_v also GL_ARB_shader_atomic_counters
     # GetDoublei_v also GL_ARB_shader_atomic_counters
 

diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 11345febe2e4a67aaea4dab644ca2fb5846108c5..f04fea9e3bc9f4b383f320f79a60620906a2a275 100644 (file)
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -182,7 +182,7 @@ EXT(ARB_vertex_program                      , ARB_vertex_program
 EXT(ARB_vertex_shader                       , ARB_vertex_shader                      , GLL, GLC,  x ,  x , 2002)
 EXT(ARB_vertex_type_10f_11f_11f_rev         , ARB_vertex_type_10f_11f_11f_rev        , GLL, GLC,  x ,  x , 2013)
 EXT(ARB_vertex_type_2_10_10_10_rev          , ARB_vertex_type_2_10_10_10_rev         , GLL, GLC,  x ,  x , 2009)
-EXT(ARB_viewport_array                      , ARB_viewport_array                     ,  x , GLC,  x ,  x , 2010)
+EXT(ARB_viewport_array                      , ARB_viewport_array                     , GLL, GLC,  x ,  x , 2010)
 EXT(ARB_window_pos                          , dummy_true                             , GLL,  x ,  x ,  x , 2001)
 
 EXT(ATI_blend_equation_separate             , EXT_blend_equation_separate            , GLL, GLC,  x ,  x , 2003)

diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index ed99f1a1957882b0cbc7575142194214a99c3896..085b1f7dd5fb59ee33787add4fa5f0cad2a553ad 100644 (file)
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -884,6 +884,15 @@ const struct function common_desktop_functions_possible[] = {
 // { "glTextureStorage2DMultisampleEXT", 43, -1 },      // XXX: Add to xml
 // { "glTextureStorage3DMultisampleEXT", 43, -1 },      // XXX: Add to xml
 
+   { "glViewportArrayv", 43, -1 },
+   { "glViewportIndexedf", 43, -1 },
+   { "glViewportIndexedfv", 43, -1 },
+   { "glScissorArrayv", 43, -1 },
+   { "glScissorIndexed", 43, -1 },
+   { "glScissorIndexedv", 43, -1 },
+   { "glDepthRangeArrayv", 43, -1 },
+   { "glDepthRangeIndexed", 43, -1 },
+
 /* GL 4.5 */
    /* aliased versions checked above */
    //{ "glGetGraphicsResetStatus", 45, -1 },
@@ -1766,14 +1775,6 @@ const struct function gl_core_functions_possible[] = {
    { "glVertexAttribL4dv", 41, -1 },
    { "glVertexAttribLPointer", 41, -1 },
    { "glGetVertexAttribLdv", 41, -1 },
-   { "glViewportArrayv", 43, -1 },
-   { "glViewportIndexedf", 43, -1 },
-   { "glViewportIndexedfv", 43, -1 },
-   { "glScissorArrayv", 43, -1 },
-   { "glScissorIndexed", 43, -1 },
-   { "glScissorIndexedv", 43, -1 },
-   { "glDepthRangeArrayv", 43, -1 },
-   { "glDepthRangeIndexed", 43, -1 },
 
 // { "glCreateSyncFromCLeventARB", 43, -1 },            // XXX: Add to xml