diff options
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_context.h')
-rw-r--r-- | src/mesa/drivers/dri/r300/r300_context.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h index 0ece8f8d1f..c03dd03daf 100644 --- a/src/mesa/drivers/dri/r300/r300_context.h +++ b/src/mesa/drivers/dri/r300/r300_context.h @@ -826,6 +826,7 @@ struct r300_context { */ struct r300_dma dma; GLboolean save_on_next_unlock; + GLuint NewGLState; /* Texture object bookkeeping */ @@ -839,17 +840,6 @@ struct r300_context { */ GLuint prefer_gart_client_texturing; - /* TCL stuff - */ - GLmatrix TexGenMatrix[R300_MAX_TEXTURE_UNITS]; - GLboolean recheck_texgen[R300_MAX_TEXTURE_UNITS]; - GLboolean TexGenNeedNormals[R300_MAX_TEXTURE_UNITS]; - GLuint TexMatEnabled; - GLuint TexMatCompSel; - GLuint TexGenEnabled; - GLuint TexGenInputs; - GLuint TexGenCompSel; - GLmatrix tmpmat; #ifdef USER_BUFFERS key_t mm_ipc_key; int mm_shm_id; @@ -885,7 +875,7 @@ extern GLboolean r300CreateContext(const __GLcontextModes * glVisual, void translate_vertex_shader(struct r300_vertex_program *vp); extern void r300InitShaderFuncs(struct dd_function_table *functions); -extern void r300VertexProgUpdateParams(GLcontext *ctx, struct r300_vertex_program *vp); +extern int r300VertexProgUpdateParams(GLcontext *ctx, struct r300_vertex_program *vp, float *dst); #ifdef RADEON_VTXFMT_A extern void radeon_init_vtxfmt_a(r300ContextPtr rmesa); |