projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeon: reading back to scratch reg through status map doesn't work
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
radeon
/
radeon_tex.c
diff --git
a/src/mesa/drivers/dri/radeon/radeon_tex.c
b/src/mesa/drivers/dri/radeon/radeon_tex.c
index 2dfb5042ecc23d5db5b69029b2f9c31290e3f725..2549d5cb5cbfbfc2370958700912f62c1e7de965 100644
(file)
--- a/
src/mesa/drivers/dri/radeon/radeon_tex.c
+++ b/
src/mesa/drivers/dri/radeon/radeon_tex.c
@@
-243,8
+243,13
@@
static void radeonSetTexFilter( radeonTexObjPtr t, GLenum minf, GLenum magf )
}
}
}
}
-static void radeonSetTexBorderColor( radeonTexObjPtr t,
GLubyte c
[4] )
+static void radeonSetTexBorderColor( radeonTexObjPtr t,
const GLfloat color
[4] )
{
{
+ GLubyte c[4];
+ CLAMPED_FLOAT_TO_UBYTE(c[0], color[0]);
+ CLAMPED_FLOAT_TO_UBYTE(c[1], color[1]);
+ CLAMPED_FLOAT_TO_UBYTE(c[2], color[2]);
+ CLAMPED_FLOAT_TO_UBYTE(c[3], color[3]);
t->pp_border_color = radeonPackColor( 4, c[0], c[1], c[2], c[3] );
}
t->pp_border_color = radeonPackColor( 4, c[0], c[1], c[2], c[3] );
}
@@
-339,7
+344,7
@@
static void radeonTexParameter( GLcontext *ctx, GLenum target,
break;
case GL_TEXTURE_BORDER_COLOR:
break;
case GL_TEXTURE_BORDER_COLOR:
- radeonSetTexBorderColor( t, texObj->
_BorderChan
);
+ radeonSetTexBorderColor( t, texObj->
BorderColor
);
break;
case GL_TEXTURE_BASE_LEVEL:
break;
case GL_TEXTURE_BASE_LEVEL:
@@
-439,7
+444,7
@@
radeonNewTextureObject( GLcontext *ctx, GLuint name, GLenum target )
radeonSetTexWrap( t, t->base.WrapS, t->base.WrapT );
radeonSetTexMaxAnisotropy( t, t->base.MaxAnisotropy );
radeonSetTexFilter( t, t->base.MinFilter, t->base.MagFilter );
radeonSetTexWrap( t, t->base.WrapS, t->base.WrapT );
radeonSetTexMaxAnisotropy( t, t->base.MaxAnisotropy );
radeonSetTexFilter( t, t->base.MinFilter, t->base.MagFilter );
- radeonSetTexBorderColor( t, t->base.
_BorderChan
);
+ radeonSetTexBorderColor( t, t->base.
BorderColor
);
return &t->base;
}
return &t->base;
}
@@
-447,7
+452,7
@@
radeonNewTextureObject( GLcontext *ctx, GLuint name, GLenum target )
void radeonInitTextureFuncs( struct dd_function_table *functions )
{
void radeonInitTextureFuncs( struct dd_function_table *functions )
{
- functions->ChooseTextureFormat = radeonChooseTextureFormat;
+ functions->ChooseTextureFormat = radeonChooseTextureFormat
_mesa
;
functions->TexImage1D = radeonTexImage1D;
functions->TexImage2D = radeonTexImage2D;
functions->TexSubImage1D = radeonTexSubImage1D;
functions->TexImage1D = radeonTexImage1D;
functions->TexImage2D = radeonTexImage2D;
functions->TexSubImage1D = radeonTexSubImage1D;