[Mesa-dev] [PATCH 14/22] meta/blit: Fix up #extension lines

Ian Romanick idr at freedesktop.org
Thu Feb 18 01:58:07 UTC 2016


From: Ian Romanick <ian.d.romanick at intel.com>

GL_ARB_texture_multisample is required for MSAA-MSAA and MSAA-SS blits.

GL_ARB_sample_shading is required for MSAA-MSAA blits, but it is not
used for MSAA-SS blits.

GL_ARB_gpu_shader5 is required for some MSAA-MSAA blits, but it is not
used for MSAA-SS blits.

The space before the : is removed to match the examples in all of the
GLSL extension specs.  This also matches Mesa style of not having a
space between a label and the :.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/mesa/drivers/common/meta_blit.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c
index bd93e64..da7cca6 100644
--- a/src/mesa/drivers/common/meta_blit.c
+++ b/src/mesa/drivers/common/meta_blit.c
@@ -457,9 +457,9 @@ setup_glsl_msaa_blit_shader(struct gl_context *ctx,
 
          fs_source = ralloc_asprintf(mem_ctx,
                                      "#version 130\n"
-                                     "#extension GL_ARB_texture_multisample : enable\n"
-                                     "#extension GL_ARB_sample_shading : enable\n"
-                                     "#extension GL_ARB_gpu_shader5 : enable\n"
+                                     "#extension GL_ARB_texture_multisample: require\n"
+                                     "#extension GL_ARB_sample_shading: require\n"
+                                     "#extension GL_ARB_gpu_shader5: enable\n"
                                      "#define gvec4 %svec4\n"
                                      "uniform %ssampler2DMS%s texSampler;\n"
                                      "in %s texCoords;\n"
@@ -530,9 +530,7 @@ setup_glsl_msaa_blit_shader(struct gl_context *ctx,
 
          fs_source = ralloc_asprintf(mem_ctx,
                                      "#version 130\n"
-                                     "#extension GL_ARB_texture_multisample : enable\n"
-                                     "#extension GL_ARB_sample_shading : enable\n"
-                                     "#extension GL_ARB_gpu_shader5 : enable\n"
+                                     "#extension GL_ARB_texture_multisample: require\n"
                                      "#define gvec4 %svec4\n"
                                      "uniform %ssampler2DMS%s texSampler;\n"
                                      "in %s texCoords;\n"
-- 
2.5.0



More information about the mesa-dev mailing list