diff options
| author | Marta Lofstedt <[email protected]> | 2015-09-01 08:19:11 +0300 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2015-09-01 08:19:11 +0300 |
| commit | d770e2746c0b63e47dfd4ab1733ab304dd7222da (patch) | |
| tree | 998f0e5db50120b465d1bf9b9aaed5680e7e5490 /src/mesa | |
| parent | e16531fbe3a79bc27cf00701616a260b452597ef (diff) | |
mesa: Expose GL_ARB_framebuffer_no_attachments to GLES 3.1
V2: Conform to new standard for exposing enums for OpenGL ES 3.1.
Signed-off-by: Marta Lofstedt <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 8 | ||||
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 6 | ||||
| -rw-r--r-- | src/mesa/main/version.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index b3c337e9d45..dc5ba6fc904 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -451,6 +451,11 @@ descriptor=[ [ "MAX_COMPUTE_UNIFORM_COMPONENTS", "CONST(MAX_COMPUTE_UNIFORM_COMPONENTS), extra_ARB_compute_shader_es31" ], [ "MAX_COMPUTE_IMAGE_UNIFORMS", "CONST(MAX_COMPUTE_IMAGE_UNIFORMS), extra_ARB_compute_shader_es31" ], +# GL_ARB_framebuffer_no_attachments / GLES 3.1 + ["MAX_FRAMEBUFFER_WIDTH", "CONTEXT_INT(Const.MaxFramebufferWidth), extra_ARB_framebuffer_no_attachments"], + ["MAX_FRAMEBUFFER_HEIGHT", "CONTEXT_INT(Const.MaxFramebufferHeight), extra_ARB_framebuffer_no_attachments"], + ["MAX_FRAMEBUFFER_SAMPLES", "CONTEXT_INT(Const.MaxFramebufferSamples), extra_ARB_framebuffer_no_attachments"], + # GL_ARB_explicit_uniform_location / GLES 3.1 [ "MAX_UNIFORM_LOCATIONS", "CONTEXT_INT(Const.MaxUserAssignableUniformLocations), extra_ARB_explicit_uniform_location" ], ]}, @@ -811,10 +816,7 @@ descriptor=[ [ "MAX_GEOMETRY_IMAGE_UNIFORMS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxImageUniforms), extra_ARB_shader_image_load_store_and_geometry_shader"], # GL_ARB_framebuffer_no_attachments - ["MAX_FRAMEBUFFER_WIDTH", "CONTEXT_INT(Const.MaxFramebufferWidth), extra_ARB_framebuffer_no_attachments"], - ["MAX_FRAMEBUFFER_HEIGHT", "CONTEXT_INT(Const.MaxFramebufferHeight), extra_ARB_framebuffer_no_attachments"], ["MAX_FRAMEBUFFER_LAYERS", "CONTEXT_INT(Const.MaxFramebufferLayers), extra_ARB_framebuffer_no_attachments"], - ["MAX_FRAMEBUFFER_SAMPLES", "CONTEXT_INT(Const.MaxFramebufferSamples), extra_ARB_framebuffer_no_attachments"], # GL_EXT_polygon_offset_clamp [ "POLYGON_OFFSET_CLAMP_EXT", "CONTEXT_FLOAT(Polygon.OffsetClamp), extra_EXT_polygon_offset_clamp" ], diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index b941f3e522e..0ddda59410e 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -2405,10 +2405,8 @@ const struct function gles31_functions_possible[] = { { "glDrawArraysIndirect", 31, -1 }, { "glDrawElementsIndirect", 31, -1 }, - // FINISHME: These two functions have not been implemented yet. They come - // FINISHME: from the ARB_framebuffer_no_attachments extension. - // { "glFramebufferParameteri", 31, -1 }, - // { "glGetFramebufferParameteriv", 31, -1 }, + { "glFramebufferParameteri", 31, -1 }, + { "glGetFramebufferParameteriv", 31, -1 }, { "glGetProgramInterfaceiv", 31, -1 }, { "glGetProgramResourceIndex", 31, -1 }, diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index f811c1ade4e..498b2f867d0 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -451,7 +451,7 @@ compute_version_es2(const struct gl_extensions *extensions) extensions->ARB_compute_shader && extensions->ARB_draw_indirect && extensions->ARB_explicit_uniform_location && - false /*extensions->ARB_framebuffer_no_attachments*/ && + extensions->ARB_framebuffer_no_attachments && extensions->ARB_shader_atomic_counters && extensions->ARB_shader_image_load_store && extensions->ARB_shader_image_size && |