diff options
| author | Eric Anholt <[email protected]> | 2013-06-05 14:27:34 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2013-06-07 12:55:06 -0700 |
| commit | 11ace8a8272983a2d0bccae0d17537bc82763f54 (patch) | |
| tree | 858f912e32fb172a9782da5e2c20747b306730a6 | |
| parent | fa8cefa892bd12ae9719927ee159cf48776f68d8 (diff) | |
mesa: Expose texel offset limits in GLES3.
Part of fixing piglit OpenGL ES 3.0/minmax.
v2: s/_gles3/_es3/ in extra name, for consistency (review by Matt).
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]> (v1)
| -rw-r--r-- | src/mesa/main/get.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 593c75be2d2..223d885e222 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -295,8 +295,9 @@ static const int extra_EXT_texture_integer_and_new_buffers[] = { EXTRA_END }; -static const int extra_GLSL_130[] = { +static const int extra_GLSL_130_es3[] = { EXTRA_GLSL_130, + EXTRA_API_ES3, EXTRA_END }; diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index ef1ab02e184..8d165441f2e 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -365,6 +365,10 @@ descriptor=[ # NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT [ "READ_FRAMEBUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, extra_EXT_framebuffer_blit" ], +# GL_EXT_gpu_shader4 / GLSL 1.30 + [ "MIN_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MinProgramTexelOffset), extra_GLSL_130_es3" ], + [ "MAX_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MaxProgramTexelOffset), extra_GLSL_130_es3" ], + # GL_EXT_pixel_buffer_object [ "PIXEL_PACK_BUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, extra_EXT_pixel_buffer_object" ], [ "PIXEL_UNPACK_BUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, extra_EXT_pixel_buffer_object" ], @@ -647,10 +651,6 @@ descriptor=[ # GL_ARB_color_buffer_float [ "RGBA_FLOAT_MODE_ARB", "BUFFER_FIELD(Visual.floatMode, TYPE_BOOLEAN), extra_core_ARB_color_buffer_float_and_new_buffers" ], -# GL_EXT_gpu_shader4 / GLSL 1.30 - [ "MIN_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MinProgramTexelOffset), extra_GLSL_130" ], - [ "MAX_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MaxProgramTexelOffset), extra_GLSL_130" ], - # GL_ARB_texture_buffer_object [ "MAX_TEXTURE_BUFFER_SIZE_ARB", "CONTEXT_INT(Const.MaxTextureBufferSize), extra_texture_buffer_object" ], [ "TEXTURE_BINDING_BUFFER_ARB", "LOC_CUSTOM, TYPE_INT, 0, extra_texture_buffer_object" ], |