summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/unichrome/via_context.h
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2005-01-19 12:09:33 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2005-01-19 12:09:33 +0000
commit2aa34ea98430047e28b4ac47d09421d53c4b77a2 (patch)
treea64dc912375a697028646320132c1f5a4f3073df /src/mesa/drivers/dri/unichrome/via_context.h
parentbdb5725bab0fdfffb20bbfb4f2c3d7aa3482c1bc (diff)
downloadexternal_mesa3d-2aa34ea98430047e28b4ac47d09421d53c4b77a2.zip
external_mesa3d-2aa34ea98430047e28b4ac47d09421d53c4b77a2.tar.gz
external_mesa3d-2aa34ea98430047e28b4ac47d09421d53c4b77a2.tar.bz2
Bring the texcombine fixes to the trunk.
Diffstat (limited to 'src/mesa/drivers/dri/unichrome/via_context.h')
-rw-r--r--src/mesa/drivers/dri/unichrome/via_context.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_context.h b/src/mesa/drivers/dri/unichrome/via_context.h
index 09494cd..28da220 100644
--- a/src/mesa/drivers/dri/unichrome/via_context.h
+++ b/src/mesa/drivers/dri/unichrome/via_context.h
@@ -355,8 +355,9 @@ extern void viaXMesaSetFrontClipRects(viaContextPtr vmesa);
extern void viaReAllocateBuffers(GLframebuffer *drawbuffer);
extern void viaXMesaWindowMoved(viaContextPtr vmesa);
-extern void viaTexCombineState(viaContextPtr vmesa,
- const struct gl_tex_env_combine_state * combine, unsigned unit );
+extern GLboolean viaTexCombineState(viaContextPtr vmesa,
+ const struct gl_tex_env_combine_state * combine,
+ unsigned unit );
/* Via hw already adjusted for GL pixel centers:
*/