Attachment 117980 Details for Bug 91788 – drop_image_unit_validation.patch

[patch] drop_image_unit_validation.patch

drop_image_unit_validation.patch (text/plain), 8.63 KB, created by Francisco Jerez on 2015-08-29 13:15:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francisco Jerez

Created: 2015-08-29 13:15:49 UTC

Size: 8.63 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/i965/brw_gs_surface_state.c b/src/mesa/drivers/dri/i965/brw_gs_surface_state.c
>index 0bb3074..00125c0 100644
>--- a/src/mesa/drivers/dri/i965/brw_gs_surface_state.c
>+++ b/src/mesa/drivers/dri/i965/brw_gs_surface_state.c
>@@ -129,7 +129,7 @@ brw_upload_gs_image_surfaces(struct brw_context *brw)
>       ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY];
> 
>    if (prog) {
>-      /* BRW_NEW_GS_PROG_DATA, BRW_NEW_IMAGE_UNITS */
>+      /* BRW_NEW_GS_PROG_DATA, BRW_NEW_IMAGE_UNITS, _NEW_TEXTURE */
>       brw_upload_image_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_GEOMETRY],
>                                 &brw->gs.base, &brw->gs.prog_data->base.base);
>    }
>@@ -137,6 +137,7 @@ brw_upload_gs_image_surfaces(struct brw_context *brw)
> 
> const struct brw_tracked_state brw_gs_image_surfaces = {
>    .dirty = {
>+      .mesa = _NEW_TEXTURE,
>       .brw = BRW_NEW_BATCH |
>              BRW_NEW_GEOMETRY_PROGRAM |
>              BRW_NEW_GS_PROG_DATA |
>diff --git a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
>index fd7e56e..f50dd71 100644
>--- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
>+++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
>@@ -201,7 +201,7 @@ brw_upload_vs_image_surfaces(struct brw_context *brw)
>       ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX];
> 
>    if (prog) {
>-      /* BRW_NEW_VS_PROG_DATA, BRW_NEW_IMAGE_UNITS */
>+      /* BRW_NEW_VS_PROG_DATA, BRW_NEW_IMAGE_UNITS, _NEW_TEXTURE */
>       brw_upload_image_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_VERTEX],
>                                 &brw->vs.base, &brw->vs.prog_data->base.base);
>    }
>@@ -209,6 +209,7 @@ brw_upload_vs_image_surfaces(struct brw_context *brw)
> 
> const struct brw_tracked_state brw_vs_image_surfaces = {
>    .dirty = {
>+      .mesa = _NEW_TEXTURE,
>       .brw = BRW_NEW_BATCH |
>              BRW_NEW_IMAGE_UNITS |
>              BRW_NEW_VERTEX_PROGRAM |
>diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
>index 8213f4e..1f97bac 100644
>--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
>+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
>@@ -34,6 +34,7 @@
> #include "main/blend.h"
> #include "main/mtypes.h"
> #include "main/samplerobj.h"
>+#include "main/shaderimage.h"
> #include "program/prog_parameter.h"
> #include "main/framebuffer.h"
> 
>@@ -1033,7 +1034,7 @@ brw_upload_cs_image_surfaces(struct brw_context *brw)
>       ctx->_Shader->CurrentProgram[MESA_SHADER_COMPUTE];
> 
>    if (prog) {
>-      /* BRW_NEW_CS_PROG_DATA, BRW_NEW_IMAGE_UNITS */
>+      /* BRW_NEW_CS_PROG_DATA, BRW_NEW_IMAGE_UNITS, _NEW_TEXTURE */
>       brw_upload_image_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_COMPUTE],
>                                 &brw->cs.base, &brw->cs.prog_data->base);
>    }
>@@ -1041,7 +1042,7 @@ brw_upload_cs_image_surfaces(struct brw_context *brw)
> 
> const struct brw_tracked_state brw_cs_image_surfaces = {
>    .dirty = {
>-      .mesa = _NEW_PROGRAM,
>+      .mesa = _NEW_TEXTURE | _NEW_PROGRAM,
>       .brw = BRW_NEW_BATCH |
>              BRW_NEW_CS_PROG_DATA |
>              BRW_NEW_IMAGE_UNITS
>@@ -1174,7 +1175,7 @@ update_image_surface(struct brw_context *brw,
>                      uint32_t *surf_offset,
>                      struct brw_image_param *param)
> {
>-   if (u->_Valid) {
>+   if (_mesa_is_image_unit_valid(&brw->ctx, u)) {
>       struct gl_texture_object *obj = u->TexObj;
>       const unsigned format = get_image_format(brw, u->_ActualFormat, access);
> 
>@@ -1259,7 +1260,7 @@ brw_upload_wm_image_surfaces(struct brw_context *brw)
>    struct gl_shader_program *prog = ctx->Shader._CurrentFragmentProgram;
> 
>    if (prog) {
>-      /* BRW_NEW_FS_PROG_DATA, BRW_NEW_IMAGE_UNITS */
>+      /* BRW_NEW_FS_PROG_DATA, BRW_NEW_IMAGE_UNITS, _NEW_TEXTURE */
>       brw_upload_image_surfaces(brw, prog->_LinkedShaders[MESA_SHADER_FRAGMENT],
>                                 &brw->wm.base, &brw->wm.prog_data->base);
>    }
>@@ -1267,6 +1268,7 @@ brw_upload_wm_image_surfaces(struct brw_context *brw)
> 
> const struct brw_tracked_state brw_wm_image_surfaces = {
>    .dirty = {
>+      .mesa = _NEW_TEXTURE,
>       .brw = BRW_NEW_BATCH |
>              BRW_NEW_FRAGMENT_PROGRAM |
>              BRW_NEW_FS_PROG_DATA |
>diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
>index a172952..e36ad79 100644
>--- a/src/mesa/main/mtypes.h
>+++ b/src/mesa/main/mtypes.h
>@@ -4173,13 +4173,6 @@ struct gl_image_unit
>    GLboolean Layered;
> 
>    /**
>-    * GL_TRUE if the state of this image unit is valid and access from
>-    * the shader is allowed.  Otherwise loads from this unit should
>-    * return zero and stores should have no effect.
>-    */
>-   GLboolean _Valid;
>-
>-   /**
>     * Layer of the texture object bound to this unit as specified by the
>     * application.
>     */
>diff --git a/src/mesa/main/shaderimage.c b/src/mesa/main/shaderimage.c
>index c4bba84..152abf4 100644
>--- a/src/mesa/main/shaderimage.c
>+++ b/src/mesa/main/shaderimage.c
>@@ -415,8 +415,8 @@ _mesa_init_image_units(struct gl_context *ctx)
>       ctx->ImageUnits[i] = _mesa_default_image_unit(ctx);
> }
> 
>-static GLboolean
>-validate_image_unit(struct gl_context *ctx, struct gl_image_unit *u)
>+GLboolean
>+_mesa_is_image_unit_valid(struct gl_context *ctx, struct gl_image_unit *u)
> {
>    struct gl_texture_object *t = u->TexObj;
>    mesa_format tex_format;
>@@ -424,7 +424,8 @@ validate_image_unit(struct gl_context *ctx, struct gl_image_unit *u)
>    if (!t)
>       return GL_FALSE;
> 
>-   _mesa_test_texobj_completeness(ctx, t);
>+   if (!t->_BaseComplete && !t->_MipmapComplete)
>+       _mesa_test_texobj_completeness(ctx, t);
> 
>    if (u->Level < t->BaseLevel ||
>        u->Level > t->_MaxLevel ||
>@@ -473,17 +474,6 @@ validate_image_unit(struct gl_context *ctx, struct gl_image_unit *u)
>    return GL_TRUE;
> }
> 
>-void
>-_mesa_validate_image_units(struct gl_context *ctx)
>-{
>-   unsigned i;
>-
>-   for (i = 0; i < ctx->Const.MaxImageUnits; ++i) {
>-      struct gl_image_unit *u = &ctx->ImageUnits[i];
>-      u->_Valid = validate_image_unit(ctx, u);
>-   }
>-}
>-
> static GLboolean
> validate_bind_image_texture(struct gl_context *ctx, GLuint unit,
>                             GLuint texture, GLint level, GLboolean layered,
>@@ -567,7 +557,6 @@ _mesa_BindImageTexture(GLuint unit, GLuint texture, GLint level,
>    u->Access = access;
>    u->Format = format;
>    u->_ActualFormat = _mesa_get_shader_image_format(format);
>-   u->_Valid = validate_image_unit(ctx, u);
> 
>    if (u->TexObj && _mesa_tex_target_is_layered(u->TexObj->Target)) {
>       u->Layered = layered;
>@@ -707,7 +696,6 @@ _mesa_BindImageTextures(GLuint first, GLsizei count, const GLuint *textures)
>          u->Access = GL_READ_WRITE;
>          u->Format = tex_format;
>          u->_ActualFormat = _mesa_get_shader_image_format(tex_format);
>-         u->_Valid = validate_image_unit(ctx, u);
>       } else {
>          /* Unbind the texture from the unit */
>          _mesa_reference_texobj(&u->TexObj, NULL);
>@@ -717,7 +705,6 @@ _mesa_BindImageTextures(GLuint first, GLsizei count, const GLuint *textures)
>          u->Access = GL_READ_ONLY;
>          u->Format = GL_R8;
>          u->_ActualFormat = MESA_FORMAT_R_UNORM8;
>-         u->_Valid = GL_FALSE;
>       }
> 
>       /* Pass the BindImageTexture call down to the device driver */
>diff --git a/src/mesa/main/shaderimage.h b/src/mesa/main/shaderimage.h
>index bbe088a..94ee814 100644
>--- a/src/mesa/main/shaderimage.h
>+++ b/src/mesa/main/shaderimage.h
>@@ -55,13 +55,15 @@ void
> _mesa_init_image_units(struct gl_context *ctx);
> 
> /**
>- * Recalculate the \c _Valid flag of a context's shader image units.
>+ * Return GL_TRUE if the state of the image unit passed as argument is valid
>+ * and access from the shader is allowed.  Otherwise loads from this unit
>+ * should return zero and stores should have no effect.
>  *
>- * To be called when the state of any texture bound to an image unit
>- * changes.
>+ * The result depends on context state other than the passed image unit, part
>+ * of the _NEW_TEXTURE set.
>  */
>-void
>-_mesa_validate_image_units(struct gl_context *ctx);
>+GLboolean
>+_mesa_is_image_unit_valid(struct gl_context *ctx, struct gl_image_unit *u);
> 
> void GLAPIENTRY
> _mesa_BindImageTexture(GLuint unit, GLuint texture, GLint level,
>diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
>index 9b5928c..cb147fa 100644
>--- a/src/mesa/main/texstate.c
>+++ b/src/mesa/main/texstate.c
>@@ -34,7 +34,6 @@
> #include "context.h"
> #include "enums.h"
> #include "macros.h"
>-#include "shaderimage.h"
> #include "texobj.h"
> #include "teximage.h"
> #include "texstate.h"
>@@ -741,8 +740,6 @@ update_texture_state( struct gl_context *ctx )
> 
>    if (!prog[MESA_SHADER_FRAGMENT] || !prog[MESA_SHADER_VERTEX])
>       update_texgen(ctx);
>-
>-   _mesa_validate_image_units(ctx);
> }
> 
>

Actions: View | Splinter Review

Attachments on bug 91788: 117961 | 117980

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.