Mesa (master): tnl: fix not having texture coords in ATI_fs in swrast
Marek Olšák
mareko at kemper.freedesktop.org
Mon Dec 25 13:37:29 UTC 2017
Module: Mesa
Branch: master
Commit: 7df48c48f9c50ebb96bad563fc119382b7fc1e78
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7df48c48f9c50ebb96bad563fc119382b7fc1e78
Author: Miklós Máté <mtmkls at gmail.com>
Date: Sat Dec 2 23:35:22 2017 +0100
tnl: fix not having texture coords in ATI_fs in swrast
ATI_fs in swrast only had access to texture coordinates if there was a
valid texture bound and texturing was enabled.
Piglit: spec/ati_fragment_shader/render-sources and render-notexture
Signed-off-by: Miklós Máté <mtmkls at gmail.com>
---
src/mesa/tnl/t_context.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index ec18fa01b2..bb5d9fc07b 100644
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -157,7 +157,8 @@ _tnl_InvalidateState( struct gl_context *ctx, GLuint new_state )
for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
if (ctx->Texture._EnabledCoordUnits & (1 << i) ||
- (fp && fp->info.inputs_read & VARYING_BIT_TEX(i))) {
+ (fp && fp->info.inputs_read & VARYING_BIT_TEX(i)) ||
+ _mesa_ati_fragment_shader_enabled(ctx)) {
tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_TEX(i));
}
}
More information about the mesa-commit
mailing list