On Mon, Jan 12, 2015 at 9:54 PM, Tapani Pälli <tapani.pa...@intel.com> wrote:
> Patch enables ES2 extension that utilizes existing ES3 functionality.
>
> Changes make all the subtests to run and pass in WebGL conformance
> test 'webgl-draw-buffers' when running Chrome on OpenGL ES, also
> Piglit test 'draw_buffers_gles2' passes.
>
> v2: remove unused boolean (Ilia Mirkin)
> v3: proper error checking for invalid values (Chad Versace)
> v4: run error check explicitly for ES2 and ES3 (Kenneth Graunke)
>
> Signed-off-by: Tapani Pälli <tapani.pa...@intel.com>
> ---
> src/glsl/glcpp/glcpp-parse.y | 1 +
> src/glsl/glsl_parser_extras.cpp | 1 +
> src/glsl/glsl_parser_extras.h | 2 ++
> src/mapi/glapi/gen/es_EXT.xml | 9 +++++++++
> src/mesa/main/buffers.c | 6 ++++--
> src/mesa/main/extensions.c | 1 +
> 6 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
> index 9b1a4f4..9e705ef 100644
> --- a/src/glsl/glcpp/glcpp-parse.y
> +++ b/src/glsl/glcpp/glcpp-parse.y
> @@ -2375,6 +2375,7 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t
> *parser, intmax_t versio
> if (parser->is_gles) {
> add_builtin_define(parser, "GL_ES", 1);
> add_builtin_define(parser, "GL_EXT_separate_shader_objects", 1);
> + add_builtin_define(parser, "GL_EXT_draw_buffers", 1);
>
> if (extensions != NULL) {
> if (extensions->OES_EGL_image_external)
> diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
> index 27e2eaf3..6d18cd4 100644
> --- a/src/glsl/glsl_parser_extras.cpp
> +++ b/src/glsl/glsl_parser_extras.cpp
> @@ -561,6 +561,7 @@ static const _mesa_glsl_extension
> _mesa_glsl_supported_extensions[] = {
> EXT(AMD_shader_trinary_minmax, true, false, dummy_true),
> EXT(AMD_vertex_shader_layer, true, false,
> AMD_vertex_shader_layer),
> EXT(AMD_vertex_shader_viewport_index, true, false,
> AMD_vertex_shader_viewport_index),
> + EXT(EXT_draw_buffers, false, true, dummy_true),
> EXT(EXT_separate_shader_objects, false, true, dummy_true),
> EXT(EXT_shader_integer_mix, true, true,
> EXT_shader_integer_mix),
> EXT(EXT_texture_array, true, false, EXT_texture_array),
> diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
> index e04f7ce..4887672 100644
> --- a/src/glsl/glsl_parser_extras.h
> +++ b/src/glsl/glsl_parser_extras.h
> @@ -473,6 +473,8 @@ struct _mesa_glsl_parse_state {
> bool AMD_vertex_shader_layer_warn;
> bool AMD_vertex_shader_viewport_index_enable;
> bool AMD_vertex_shader_viewport_index_warn;
> + bool EXT_draw_buffers_enable;
> + bool EXT_draw_buffers_warn;
> bool EXT_separate_shader_objects_enable;
> bool EXT_separate_shader_objects_warn;
> bool EXT_shader_integer_mix_enable;
> diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
> index e2dc390..3a2adeb 100644
> --- a/src/mapi/glapi/gen/es_EXT.xml
> +++ b/src/mapi/glapi/gen/es_EXT.xml
> @@ -837,4 +837,13 @@
> </function>
> </category>
>
> +<!-- 151. GL_EXT_draw_buffers -->
> +<category name="GL_EXT_draw_buffers" number="151">
> + <function name="DrawBuffersEXT" alias="DrawBuffers"
> + static_dispatch="false" es2="2.0">
> + <param name="n" type="GLsizei" counter="true"/>
> + <param name="bufs" type="const GLenum *" count="n"/>
> + </function>
> +</category>
> +
> </OpenGLAPI>
> diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
> index 1ee2009..49157f7 100644
> --- a/src/mesa/main/buffers.c
> +++ b/src/mesa/main/buffers.c
> @@ -326,8 +326,9 @@ _mesa_DrawBuffers(GLsizei n, const GLenum *buffers)
> /* From the ES 3.0 specification, page 180:
> * "If the GL is bound to the default framebuffer, then n must be 1
> * and the constant must be BACK or NONE."
> + * (same restriction applies with GL_EXT_draw_buffers specification)
> */
> - if (_mesa_is_gles3(ctx) && _mesa_is_winsys_fbo(ctx->DrawBuffer) &&
> + if (ctx->API == API_OPENGLES2 && _mesa_is_winsys_fbo(ctx->DrawBuffer) &&
> (n != 1 || (buffers[0] != GL_NONE && buffers[0] != GL_BACK))) {
> _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffers(buffer)");
> return;
> @@ -399,8 +400,9 @@ _mesa_DrawBuffers(GLsizei n, const GLenum *buffers)
> /* ES 3.0 is even more restrictive. From the ES 3.0 spec, page 180:
> * "If the GL is bound to a framebuffer object, the ith buffer
> listed
> * in bufs must be COLOR_ATTACHMENTi or NONE. [...]
> INVALID_OPERATION."
> + * (same restriction applies with GL_EXT_draw_buffers specification)
> */
> - if (_mesa_is_gles3(ctx) && _mesa_is_user_fbo(ctx->DrawBuffer) &&
> + if (ctx->API == API_OPENGLES2 && _mesa_is_user_fbo(ctx->DrawBuffer)
> &&
> buffers[output] != GL_NONE &&
> buffers[output] != GL_COLOR_ATTACHMENT0 + output) {
> _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffers(buffer)");
> diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
> index 4fa9d1a..0d95eff 100644
> --- a/src/mesa/main/extensions.c
> +++ b/src/mesa/main/extensions.c
> @@ -213,6 +213,7 @@ static const struct extension extension_table[] = {
> { "GL_EXT_compiled_vertex_array", o(dummy_true),
> GLL, 1996 },
> { "GL_EXT_copy_texture", o(dummy_true),
> GLL, 1995 },
> { "GL_EXT_depth_bounds_test", o(EXT_depth_bounds_test),
> GL, 2002 },
> + { "GL_EXT_draw_buffers", o(dummy_true),
> ES2, 2012 },
I know the other ES2 cases have misaligned the data column in this
area, but that's because of the extra character in GLL. Remove a space
before ES2 to align the date column, and have a
Reviewed-by: Matt Turner <matts...@gmail.com>
> { "GL_EXT_draw_buffers2", o(EXT_draw_buffers2),
> GL, 2006 },
> { "GL_EXT_draw_instanced", o(ARB_draw_instanced),
> GL, 2006 },
> { "GL_EXT_draw_range_elements", o(dummy_true),
> GLL, 1997 },
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
