Mesa (gallium-mesa-7.4): glsl: fix a swizzle-related regression
Alan Hourihane
alanh at kemper.freedesktop.org
Tue Feb 24 10:44:29 UTC 2009
Module: Mesa
Branch: gallium-mesa-7.4
Commit: f3d1c136b72115ab0888c6573d588b0a549c2137
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3d1c136b72115ab0888c6573d588b0a549c2137
Author: Brian Paul <brianp at vmware.com>
Date: Wed Feb 18 13:37:31 2009 -0700
glsl: fix a swizzle-related regression
This new issue was exposed by commit 6eabfc27f19a10dfc2663e99f9560966ba1ff697
(cherry picked from master, commit 212f41b80fe00a8d44d79f2c8e4018836adb8b86)
---
src/mesa/shader/slang/slang_emit.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index 94dca5f..a9334a4 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -164,7 +164,7 @@ _slang_var_swizzle(GLint size, GLint comp)
{
switch (size) {
case 1:
- return MAKE_SWIZZLE4(comp, comp, comp, comp);
+ return MAKE_SWIZZLE4(comp, SWIZZLE_NIL, SWIZZLE_NIL, SWIZZLE_NIL);
case 2:
return MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_NIL, SWIZZLE_NIL);
case 3:
More information about the mesa-commit
mailing list