diff options
| -rw-r--r-- | src/mapi/glapi/gen/ARB_framebuffer_no_attachments.xml | 4 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/apiexec.py | 4 | ||||
| -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 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/mapi/glapi/gen/ARB_framebuffer_no_attachments.xml b/src/mapi/glapi/gen/ARB_framebuffer_no_attachments.xml index 59839a0..55ad764 100644 --- a/src/mapi/glapi/gen/ARB_framebuffer_no_attachments.xml +++ b/src/mapi/glapi/gen/ARB_framebuffer_no_attachments.xml @@ -15,13 +15,13 @@ <enum name="MAX_FRAMEBUFFER_LAYERS" value="0x9317" /> <enum name="MAX_FRAMEBUFFER_SAMPLES" value="0x9318" /> - <function name="FramebufferParameteri"> + <function name="FramebufferParameteri" es2="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint" /> </function> - <function name="GetFramebufferParameteriv"> + <function name="GetFramebufferParameteriv" es2="3.1"> <param name="target" type="GLenum" /> <param name="pname" type="GLenum" /> <param name="params" type="GLint *" output="true" /> diff --git a/src/mapi/glapi/gen/apiexec.py b/src/mapi/glapi/gen/apiexec.py index 3a0eb18..58ec08b 100644 --- a/src/mapi/glapi/gen/apiexec.py +++ b/src/mapi/glapi/gen/apiexec.py @@ -151,8 +151,8 @@ functions = { # OpenGL 4.3 / GL_ARB_framebuffer_no_attachments. Mesa can expose the # extension with OpenGL 3.0. - "FramebufferParameteri": exec_info(compatibility=30, core=31), - "GetFramebufferParameteri": exec_info(compatibility=30, core=31), + "FramebufferParameteri": exec_info(compatibility=30, core=31, es2=31), + "GetFramebufferParameteri": exec_info(compatibility=30, core=31, es2=31), # OpenGL 4.5 / GL_ARB_direct_state_access. Mesa can expose the extension # with core profile. diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index b3c337e..dc5ba6f 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 b941f3e..0ddda59 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 f811c1a..498b2f8 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 && |