diff options
| author | Courtney Goeltzenleuchter <[email protected]> | 2013-11-14 10:10:47 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2014-01-20 11:32:00 -0800 |
| commit | 9ef16befd0068544287c5f327a77fe8af6aee329 (patch) | |
| tree | 5e7ce61c348ae8d09b53284b3b24ada7eec944de /src/mesa/main | |
| parent | c2eefb06aa3522920548046ee0c1be59428649ed (diff) | |
mesa: Add ARB_viewport_array plumbing
Define API connections to extension entry points added in previous
commits. Update entry points to use floating point arguments as
required by the extension.
Add get tokens for ARB_viewport_array state.
v2: Include review feedback.
v3 (idr): Fix 'make check'. Add missing Get infrastructure (some was
culled from other pathces).
Signed-off-by: Courtney Goeltzenleuchter <[email protected]>
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/get.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 7 | ||||
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 20 |
3 files changed, 18 insertions, 10 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 9edf05620a9..2b1538df938 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -391,6 +391,7 @@ EXTRA_EXT(ARB_texture_gather); EXTRA_EXT(ARB_shader_atomic_counters); EXTRA_EXT(ARB_draw_indirect); EXTRA_EXT(ARB_shader_image_load_store); +EXTRA_EXT(ARB_viewport_array); static const int extra_ARB_color_buffer_float_or_glcore[] = { diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 3aa05483c84..b45e1430bac 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -759,6 +759,13 @@ descriptor=[ [ "TEXTURE_BUFFER_OFFSET_ALIGNMENT", "CONTEXT_INT(Const.TextureBufferOffsetAlignment), extra_ARB_texture_buffer_range" ], # GL_ARB_draw_indirect [ "DRAW_INDIRECT_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_draw_indirect" ], + +# GL_ARB_viewport_array + [ "MAX_VIEWPORTS", "CONTEXT_INT(Const.MaxViewports), extra_ARB_viewport_array" ], + [ "VIEWPORT_SUBPIXEL_BITS", "CONTEXT_INT(Const.ViewportSubpixelBits), extra_ARB_viewport_array" ], + [ "VIEWPORT_BOUNDS_RANGE", "CONTEXT_FLOAT2(Const.ViewportBounds), extra_ARB_viewport_array" ], + [ "LAYER_PROVOKING_VERTEX", "CONTEXT_ENUM(Light.ProvokingVertex), extra_ARB_viewport_array" ], + [ "VIEWPORT_INDEX_PROVOKING_VERTEX", "CONTEXT_ENUM(Light.ProvokingVertex), extra_ARB_viewport_array" ], ]} ] diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index b9719569f08..78a218ea17b 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -786,16 +786,16 @@ const struct function gl_core_functions_possible[] = { // { "glVertexAttribL4dv", 43, -1 }, // XXX: Add to xml // { "glVertexAttribLPointer", 43, -1 }, // XXX: Add to xml // { "glGetVertexAttribLdv", 43, -1 }, // XXX: Add to xml -// { "glViewportArrayv", 43, -1 }, // XXX: Add to xml -// { "glViewportIndexedf", 43, -1 }, // XXX: Add to xml -// { "glViewportIndexedfv", 43, -1 }, // XXX: Add to xml -// { "glScissorArrayv", 43, -1 }, // XXX: Add to xml -// { "glScissorIndexed", 43, -1 }, // XXX: Add to xml -// { "glScissorIndexedv", 43, -1 }, // XXX: Add to xml -// { "glDepthRangeArrayv", 43, -1 }, // XXX: Add to xml -// { "glDepthRangeIndexed", 43, -1 }, // XXX: Add to xml -// { "glGetFloati_v", 43, -1 }, // XXX: Add to xml -// { "glGetDoublei_v", 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 }, + { "glGetFloati_v", 43, -1 }, + { "glGetDoublei_v", 43, -1 }, // { "glCreateSyncFromCLeventARB", 43, -1 }, // XXX: Add to xml { "glDebugMessageControlARB", 43, -1 }, { "glDebugMessageInsertARB", 43, -1 }, |