fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 01:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix broken SWZ instruction

Browse source
This commit is contained in:
Brian Paul 2005-10-21 15:23:13 +00:00
parent 66b928e95e
commit 2fd1ed1b45
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/mesa/shader/arbprogparse.c
View file

@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
* Version: 6.2
* Version: 6.4
*
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -2444,15 +2444,15 @@ parse_swizzle_mask (GLubyte ** inst, GLubyte * mask, GLint len)
/**
*/
static GLuint
parse_extended_swizzle_mask (GLubyte ** inst, GLubyte * mask, GLboolean * Negate)
parse_extended_swizzle_mask(GLubyte **inst, GLubyte *mask, GLubyte *negate)
{
GLint a;
GLubyte swz;
*Negate = GL_FALSE;
*negate = 0x0;
for (a = 0; a < 4; a++) {
if (parse_sign (inst) == -1)
*Negate = GL_TRUE;
*negate |= (1 << a);
swz = *(*inst)++;
@ -3037,18 +3037,15 @@ parse_fp_instruction (GLcontext * ctx, GLubyte ** inst,
{
GLubyte Swizzle[4]; /* FP's swizzle mask is a GLubyte, while VP's is GLuint */
GLubyte Negate[4];
GLubyte negateMask;
GLint File, Index;
if (parse_src_reg(ctx, inst, vc_head, Program, &File, &Index, &rel))
return 1;
parse_extended_swizzle_mask (inst, Swizzle, Negate);
parse_extended_swizzle_mask (inst, Swizzle, &negateMask);
fp->SrcReg[0].File = File;
fp->SrcReg[0].Index = Index;
fp->SrcReg[0].NegateBase = (Negate[0] << 0 |
Negate[1] << 1 |
Negate[2] << 2 |
Negate[3] << 3);
fp->SrcReg[0].NegateBase = negateMask;
fp->SrcReg[0].Swizzle = (Swizzle[0] << 0 |
Swizzle[1] << 3 |
Swizzle[2] << 6 |
@ -3262,6 +3259,7 @@ parse_vp_instruction (GLcontext * ctx, GLubyte ** inst,
vp->SrcReg[0].Swizzle = SWIZZLE_NOOP;
vp->SrcReg[1].Swizzle = SWIZZLE_NOOP;
vp->SrcReg[2].Swizzle = SWIZZLE_NOOP;
vp->SrcReg[3].Swizzle = SWIZZLE_NOOP;
vp->DstReg.WriteMask = 0xf;
switch (type) {
@ -3886,7 +3884,6 @@ static int set_reg8 (GLcontext *ctx, grammar id, const byte *name, byte value)
static int extension_is_supported (const GLubyte *ext)
{
GET_CURRENT_CONTEXT(ctx);
const GLubyte *extensions = CALL_GetString(GET_DISPATCH(), (GL_EXTENSIONS));
const GLubyte *end = extensions + _mesa_strlen ((const char *) extensions);
const GLint ext_len = (GLint)_mesa_strlen ((const char *) ext);

8
src/mesa/swrast/s_nvfragprog.c
View file

@ -1157,15 +1157,15 @@ execute_program( GLcontext *ctx,
GLuint i;
/* do extended swizzling here */
for (i = 0; i < 3; i++) {
for (i = 0; i < 4; i++) {
if (GET_SWZ(source->Swizzle, i) == SWIZZLE_ZERO)
result[i] = 0.0;
else if (GET_SWZ(source->Swizzle, i) == SWIZZLE_ONE)
result[i] = -1.0;
result[i] = 1.0;
else
result[i] = -src[GET_SWZ(source->Swizzle, i)];
result[i] = src[GET_SWZ(source->Swizzle, i)];
if (source->NegateBase)
if (source->NegateBase & (1 << i))
result[i] = -result[i];
}
store_vector4( inst, machine, result );