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

r300: Changed a couple of functions in r300_state.c to static functions.

Browse source
This commit is contained in:
Oliver McFadden 2007-05-13 08:59:54 +00:00
parent e4b8481f39
commit 82de92c0fb
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/mesa/drivers/dri/r300/r300_state.c
View file

@ -1439,7 +1439,7 @@ union r300_outputs_written {
((hw_tcl_on) ? (ow).vp_outputs & (1 << (vp_result)) : \
RENDERINPUTS_TEST( (ow.index_bitset), (tnl_attrib) ))
void r300SetupRSUnit(GLcontext * ctx)
static void r300SetupRSUnit(GLcontext * ctx)
{
r300ContextPtr r300 = R300_CONTEXT(ctx);
/* I'm still unsure if these are needed */
@ -1858,22 +1858,7 @@ void r300UpdateShaders(r300ContextPtr rmesa)
}
void r300UpdateShaderStates(r300ContextPtr rmesa)
{
GLcontext *ctx;
ctx = rmesa->radeon.glCtx;
r300UpdateTextureState(ctx);
r300SetupPixelShader(rmesa);
r300SetupTextures(ctx);
if ((rmesa->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL))
r300SetupVertexShader(rmesa);
r300SetupRSUnit(ctx);
}
void r300SetupPixelShader(r300ContextPtr rmesa)
static void r300SetupPixelShader(r300ContextPtr rmesa)
{
GLcontext *ctx = rmesa->radeon.glCtx;
struct r300_fragment_program *fp = (struct r300_fragment_program *)
@ -1947,6 +1932,21 @@ void r300SetupPixelShader(r300ContextPtr rmesa)
cmdpacket0(R300_PFS_PARAM_0_X, fp->const_nr * 4);
}
void r300UpdateShaderStates(r300ContextPtr rmesa)
{
GLcontext *ctx;
ctx = rmesa->radeon.glCtx;
r300UpdateTextureState(ctx);
r300SetupPixelShader(rmesa);
r300SetupTextures(ctx);
if ((rmesa->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL))
r300SetupVertexShader(rmesa);
r300SetupRSUnit(ctx);
}
/**
* Called by Mesa after an internal state update.
*/

1
src/mesa/drivers/dri/r300/r300_state.h
View file

@ -67,7 +67,6 @@ extern void r300UpdateViewportOffset(GLcontext * ctx);
extern void r300UpdateWindow(GLcontext * ctx);
extern void r300UpdateDrawBuffer(GLcontext * ctx);
extern void r300SetupVertexShader(r300ContextPtr rmesa);
extern void r300SetupPixelShader(r300ContextPtr rmesa);
extern void r300UpdateShaders(r300ContextPtr rmesa);
extern void r300UpdateShaderStates(r300ContextPtr rmesa);