meta: Fold the glUseProgram() into the blit program generator.

[mesa.git] / src / mesa / drivers / common / meta.c

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 4d4f877926d62baf8b83afb571d17add6de7e0b1..f0cd5a0a8eb9bc946665611757642584c13891d3 100644 (file)
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -312,7 +312,6 @@ struct gen_mipmap_state
    GLuint VBO;
    GLuint FBO;
    GLuint Sampler;
-   GLuint ShaderProg;
 
    struct sampler_table samplers;
 };
@@ -452,16 +451,24 @@ link_program_with_debug(struct gl_context *ctx, GLuint program)
  *
  * \returns a handle to a shader program on success or zero on failure.
  */
-static GLuint
-setup_shader_for_sampler(struct gl_context *ctx, struct glsl_sampler *sampler)
+static void
+setup_blit_shader(struct gl_context *ctx,
+                  GLenum target,
+                  struct sampler_table *table)
 {
    const char *vs_source;
    char *fs_source;
    GLuint vs, fs;
    void *const mem_ctx = ralloc_context(NULL);
+   struct glsl_sampler *sampler =
+      setup_texture_sampler(target, table);
+
+   assert(sampler != NULL);
 
-   if (sampler->shader_prog != 0)
-      return sampler->shader_prog;
+   if (sampler->shader_prog != 0) {
+      _mesa_UseProgram(sampler->shader_prog);
+      return;
+   }
 
    /* The version check is a little tricky.  API is set to API_OPENGLES2 even
     * for OpenGL ES 3.0 contexts, and GLSLVersion may be set to 140, for
@@ -540,7 +547,7 @@ setup_shader_for_sampler(struct gl_context *ctx, struct glsl_sampler *sampler)
    link_program_with_debug(ctx, sampler->shader_prog);
    ralloc_free(mem_ctx);
 
-   return sampler->shader_prog;
+   _mesa_UseProgram(sampler->shader_prog);
 }
 
 /**
@@ -1667,18 +1674,12 @@ setup_glsl_blit_framebuffer(struct gl_context *ctx,
                             struct blit_state *blit,
                             GLenum target)
 {
-   struct glsl_sampler *sampler;
-
    /* target = GL_TEXTURE_RECTANGLE is not supported in GLES 3.0 */
    assert(_mesa_is_desktop_gl(ctx) || target == GL_TEXTURE_2D);
 
    setup_vertex_objects(&blit->VAO, &blit->VBO, true, 2, 2, 0);
 
-   /* Generate a relevant fragment shader program for the texture target */
-   sampler = setup_texture_sampler(target, &blit->samplers);
-   assert(sampler != NULL);
-
-   setup_shader_for_sampler(ctx, sampler);
+   setup_blit_shader(ctx, target, &blit->samplers);
 }
 
 /**
@@ -1745,10 +1746,6 @@ blitframebuffer_texture(struct gl_context *ctx,
           */
          if (glsl_version) {
             setup_glsl_blit_framebuffer(ctx, blit, target);
-            if (target == GL_TEXTURE_2D)
-               _mesa_UseProgram(blit->samplers.sampler_2d.shader_prog);
-            else
-               _mesa_UseProgram(blit->samplers.sampler_rect.shader_prog);
          }
          else {
             setup_ff_tnl_for_blit(&ctx->Meta->Blit.VAO,
@@ -1926,10 +1923,6 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
     */
    if (use_glsl_version) {
       setup_glsl_blit_framebuffer(ctx, blit, tex->Target);
-      if (tex->Target == GL_TEXTURE_2D)
-         _mesa_UseProgram(blit->samplers.sampler_2d.shader_prog);
-      else
-         _mesa_UseProgram(blit->samplers.sampler_rect.shader_prog);
    }
    else {
       setup_ff_tnl_for_blit(&blit->VAO, &blit->VBO, 2);
@@ -3432,15 +3425,9 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
                            struct gen_mipmap_state *mipmap,
                            GLenum target)
 {
-   struct glsl_sampler *sampler;
-
    setup_vertex_objects(&mipmap->VAO, &mipmap->VBO, true, 2, 3, 0);
 
-   /* Generate a fragment shader program appropriate for the texture target */
-   sampler = setup_texture_sampler(target, &mipmap->samplers);
-   assert(sampler != NULL);
-
-   mipmap->ShaderProg = setup_shader_for_sampler(ctx, sampler);
+   setup_blit_shader(ctx, target, &mipmap->samplers);
 }
 
 
@@ -3504,7 +3491,6 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
     */
    if (use_glsl_version) {
       setup_glsl_generate_mipmap(ctx, mipmap, target);
-      _mesa_UseProgram(mipmap->ShaderProg);
    }
    else {
       setup_ff_tnl_for_blit(&mipmap->VAO, &mipmap->VBO, 3);
@@ -3877,11 +3863,11 @@ decompress_texture_image(struct gl_context *ctx,
    const bool use_glsl_version = ctx->Extensions.ARB_vertex_shader &&
                                       ctx->Extensions.ARB_fragment_shader &&
                                       (ctx->API != API_OPENGLES);
-   GLuint shaderProg = 0;
 
    if (slice > 0) {
       assert(target == GL_TEXTURE_3D ||
-             target == GL_TEXTURE_2D_ARRAY);
+             target == GL_TEXTURE_2D_ARRAY ||
+             target == GL_TEXTURE_CUBE_MAP_ARRAY);
    }
 
    switch (target) {
@@ -3895,8 +3881,8 @@ decompress_texture_image(struct gl_context *ctx,
       return;
 
    case GL_TEXTURE_CUBE_MAP_ARRAY:
-      /* This target is just broken currently. */
-      return;
+      faceTarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X + (slice % 6);
+      break;
 
    case GL_TEXTURE_CUBE_MAP:
       faceTarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X + texImage->Face;
@@ -3942,16 +3928,10 @@ decompress_texture_image(struct gl_context *ctx,
    }
 
    if (use_glsl_version) {
-      struct glsl_sampler *sampler;
-
       setup_vertex_objects(&decompress->VAO, &decompress->VBO, true,
-                           2, 3, 0);
-
-      /* Generate a relevant fragment shader program for the texture target */
-      sampler = setup_texture_sampler(target, &decompress->samplers);
-      assert(sampler != NULL);
+                           2, 4, 0);
 
-      shaderProg = setup_shader_for_sampler(ctx, sampler);
+      setup_blit_shader(ctx, target, &decompress->samplers);
    } else {
       setup_ff_tnl_for_blit(&decompress->VAO, &decompress->VBO, 3);
    }
@@ -4001,10 +3981,6 @@ decompress_texture_image(struct gl_context *ctx,
 
    if (!use_glsl_version)
       _mesa_set_enable(ctx, target, GL_TRUE);
-   else {
-      assert(shaderProg != 0);
-      _mesa_UseProgram(shaderProg);
-   }
 
    {
       /* save texture object state */
@@ -4097,8 +4073,7 @@ _mesa_meta_GetTexImage(struct gl_context *ctx,
     * unsigned, normalized values.  We could handle signed and unnormalized 
     * with floating point renderbuffers...
     */
-   if (texImage->TexObject->Target != GL_TEXTURE_CUBE_MAP_ARRAY
-       && _mesa_is_format_compressed(texImage->TexFormat) &&
+   if (_mesa_is_format_compressed(texImage->TexFormat) &&
        _mesa_get_format_datatype(texImage->TexFormat)
        == GL_UNSIGNED_NORMALIZED) {
       struct gl_texture_object *texObj = texImage->TexObject;
@@ -4107,7 +4082,8 @@ _mesa_meta_GetTexImage(struct gl_context *ctx,
       _mesa_unlock_texture(ctx, texObj);
       for (slice = 0; slice < texImage->Depth; slice++) {
          void *dst;
-         if (texImage->TexObject->Target == GL_TEXTURE_2D_ARRAY) {
+         if (texImage->TexObject->Target == GL_TEXTURE_2D_ARRAY
+             || texImage->TexObject->Target == GL_TEXTURE_CUBE_MAP_ARRAY) {
             /* Setup pixel packing.  SkipPixels and SkipRows will be applied
              * in the decompress_texture_image() function's call to
              * glReadPixels but we need to compute the dest slice's address