projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'llvm-cliptest-viewport'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
tdfx
/
tdfx_state.c
diff --git
a/src/mesa/drivers/dri/tdfx/tdfx_state.c
b/src/mesa/drivers/dri/tdfx/tdfx_state.c
index cdb61a0ce05bfb52e6f1d501222a53cd6f1936da..3f6822d4574d31d2ad448256c8cf161400c29b61 100644
(file)
--- a/
src/mesa/drivers/dri/tdfx/tdfx_state.c
+++ b/
src/mesa/drivers/dri/tdfx/tdfx_state.c
@@
-40,8
+40,6
@@
#include "main/mtypes.h"
#include "main/colormac.h"
#include "main/mtypes.h"
#include "main/colormac.h"
-#include "main/texstore.h"
-#include "main/teximage.h"
#include "swrast/swrast.h"
#include "vbo/vbo.h"
#include "swrast/swrast.h"
#include "vbo/vbo.h"
@@
-51,11
+49,9
@@
#include "tdfx_context.h"
#include "tdfx_state.h"
#include "tdfx_context.h"
#include "tdfx_state.h"
-#include "tdfx_vb.h"
#include "tdfx_tex.h"
#include "tdfx_texman.h"
#include "tdfx_texstate.h"
#include "tdfx_tex.h"
#include "tdfx_texman.h"
#include "tdfx_texstate.h"
-#include "tdfx_tris.h"
#include "tdfx_render.h"
#include "tdfx_render.h"
@@
-64,7
+60,7
@@
* Alpha blending
*/
* Alpha blending
*/
-static void tdfxUpdateAlphaMode(
GL
context *ctx )
+static void tdfxUpdateAlphaMode(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GrCmpFnc_t func;
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GrCmpFnc_t func;
@@
-287,7
+283,7
@@
static void tdfxUpdateAlphaMode( GLcontext *ctx )
}
}
}
}
-static void tdfxDDAlphaFunc(
GL
context *ctx, GLenum func, GLfloat ref )
+static void tdfxDDAlphaFunc(
struct gl_
context *ctx, GLenum func, GLfloat ref )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
@@
-295,7
+291,7
@@
static void tdfxDDAlphaFunc( GLcontext *ctx, GLenum func, GLfloat ref )
fxMesa->new_state |= TDFX_NEW_ALPHA;
}
fxMesa->new_state |= TDFX_NEW_ALPHA;
}
-static void tdfxDDBlendEquationSeparate(
GL
context *ctx,
+static void tdfxDDBlendEquationSeparate(
struct gl_
context *ctx,
GLenum modeRGB, GLenum modeA )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
GLenum modeRGB, GLenum modeA )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
@@
-305,7
+301,7
@@
static void tdfxDDBlendEquationSeparate( GLcontext *ctx,
fxMesa->new_state |= TDFX_NEW_ALPHA;
}
fxMesa->new_state |= TDFX_NEW_ALPHA;
}
-static void tdfxDDBlendFuncSeparate(
GL
context *ctx,
+static void tdfxDDBlendFuncSeparate(
struct gl_
context *ctx,
GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA )
{
GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA )
{
@@
-325,7
+321,7
@@
static void tdfxDDBlendFuncSeparate( GLcontext *ctx,
* Stipple
*/
* Stipple
*/
-void tdfxUpdateStipple(
GL
context *ctx )
+void tdfxUpdateStipple(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
GrStippleMode_t mode = GR_STIPPLE_DISABLE;
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
GrStippleMode_t mode = GR_STIPPLE_DISABLE;
@@
-351,7
+347,7
@@
void tdfxUpdateStipple( GLcontext *ctx )
* Depth testing
*/
* Depth testing
*/
-static void tdfxUpdateZMode(
GL
context *ctx )
+static void tdfxUpdateZMode(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
GrCmpFnc_t func;
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
GrCmpFnc_t func;
@@
-390,7
+386,7
@@
static void tdfxUpdateZMode( GLcontext *ctx )
}
}
}
}
-static void tdfxDDDepthFunc(
GL
context *ctx, GLenum func )
+static void tdfxDDDepthFunc(
struct gl_
context *ctx, GLenum func )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
@@
-398,7
+394,7
@@
static void tdfxDDDepthFunc( GLcontext *ctx, GLenum func )
fxMesa->new_state |= TDFX_NEW_DEPTH;
}
fxMesa->new_state |= TDFX_NEW_DEPTH;
}
-static void tdfxDDDepthMask(
GL
context *ctx, GLboolean flag )
+static void tdfxDDDepthMask(
struct gl_
context *ctx, GLboolean flag )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
@@
-406,7
+402,7
@@
static void tdfxDDDepthMask( GLcontext *ctx, GLboolean flag )
fxMesa->new_state |= TDFX_NEW_DEPTH;
}
fxMesa->new_state |= TDFX_NEW_DEPTH;
}
-static void tdfxDDClearDepth(
GL
context *ctx, GLclampd d )
+static void tdfxDDClearDepth(
struct gl_
context *ctx, GLclampd d )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
@@
-449,7
+445,7
@@
static GrStencil_t convertGLStencilOp( GLenum op )
}
}
-static void tdfxUpdateStencil(
GL
context *ctx )
+static void tdfxUpdateStencil(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
@@
-474,7
+470,7
@@
static void tdfxUpdateStencil( GLcontext *ctx )
static void
static void
-tdfxDDStencilFuncSeparate(
GL
context *ctx, GLenum face, GLenum func,
+tdfxDDStencilFuncSeparate(
struct gl_
context *ctx, GLenum face, GLenum func,
GLint ref, GLuint mask )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GLint ref, GLuint mask )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
@@
-484,7
+480,7
@@
tdfxDDStencilFuncSeparate( GLcontext *ctx, GLenum face, GLenum func,
}
static void
}
static void
-tdfxDDStencilMaskSeparate(
GL
context *ctx, GLenum face, GLuint mask )
+tdfxDDStencilMaskSeparate(
struct gl_
context *ctx, GLenum face, GLuint mask )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
@@
-493,7
+489,7
@@
tdfxDDStencilMaskSeparate( GLcontext *ctx, GLenum face, GLuint mask )
}
static void
}
static void
-tdfxDDStencilOpSeparate(
GL
context *ctx, GLenum face, GLenum sfail,
+tdfxDDStencilOpSeparate(
struct gl_
context *ctx, GLenum face, GLenum sfail,
GLenum zfail, GLenum zpass )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GLenum zfail, GLenum zpass )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
@@
-507,7
+503,7
@@
tdfxDDStencilOpSeparate( GLcontext *ctx, GLenum face, GLenum sfail,
* Fog - orthographic fog still not working
*/
* Fog - orthographic fog still not working
*/
-static void tdfxUpdateFogAttrib(
GL
context *ctx )
+static void tdfxUpdateFogAttrib(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GrFogMode_t mode;
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GrFogMode_t mode;
@@
-566,7
+562,7
@@
static void tdfxUpdateFogAttrib( GLcontext *ctx )
}
}
}
}
-static void tdfxDDFogfv(
GL
context *ctx, GLenum pname, const GLfloat *param )
+static void tdfxDDFogfv(
struct gl_
context *ctx, GLenum pname, const GLfloat *param )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
@@
-618,7
+614,7
@@
static int intersect_rect( drm_clip_rect_t *out,
* Examine XF86 cliprect list and scissor state to recompute our
* cliprect list.
*/
* Examine XF86 cliprect list and scissor state to recompute our
* cliprect list.
*/
-void tdfxUpdateClipping(
GL
context *ctx )
+void tdfxUpdateClipping(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
__DRIdrawable *dPriv = fxMesa->driDrawable;
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
__DRIdrawable *dPriv = fxMesa->driDrawable;
@@
-699,7
+695,7
@@
void tdfxUpdateClipping( GLcontext *ctx )
* Culling
*/
* Culling
*/
-void tdfxUpdateCull(
GL
context *ctx )
+void tdfxUpdateCull(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GrCullMode_t mode = GR_CULL_DISABLE;
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GrCullMode_t mode = GR_CULL_DISABLE;
@@
-741,7
+737,7
@@
void tdfxUpdateCull( GLcontext *ctx )
}
}
}
}
-static void tdfxDDCullFace(
GL
context *ctx, GLenum mode )
+static void tdfxDDCullFace(
struct gl_
context *ctx, GLenum mode )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
@@
-749,7
+745,7
@@
static void tdfxDDCullFace( GLcontext *ctx, GLenum mode )
fxMesa->new_state |= TDFX_NEW_CULL;
}
fxMesa->new_state |= TDFX_NEW_CULL;
}
-static void tdfxDDFrontFace(
GL
context *ctx, GLenum mode )
+static void tdfxDDFrontFace(
struct gl_
context *ctx, GLenum mode )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
@@
-762,7
+758,7
@@
static void tdfxDDFrontFace( GLcontext *ctx, GLenum mode )
* Line drawing.
*/
* Line drawing.
*/
-static void tdfxUpdateLine(
GL
context *ctx )
+static void tdfxUpdateLine(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
@@
-775,7
+771,7
@@
static void tdfxUpdateLine( GLcontext *ctx )
}
}
-static void tdfxDDLineWidth(
GL
context *ctx, GLfloat width )
+static void tdfxDDLineWidth(
struct gl_
context *ctx, GLfloat width )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
FLUSH_BATCH( fxMesa );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
FLUSH_BATCH( fxMesa );
@@
-787,7
+783,7
@@
static void tdfxDDLineWidth( GLcontext *ctx, GLfloat width )
* Color Attributes
*/
* Color Attributes
*/
-static void tdfxDDColorMask(
GL
context *ctx,
+static void tdfxDDColorMask(
struct gl_
context *ctx,
GLboolean r, GLboolean g,
GLboolean b, GLboolean a )
{
GLboolean r, GLboolean g,
GLboolean b, GLboolean a )
{
@@
-814,7
+810,7
@@
static void tdfxDDColorMask( GLcontext *ctx,
}
}
-static void tdfxDDClearColor(
GL
context *ctx,
+static void tdfxDDClearColor(
struct gl_
context *ctx,
const GLfloat color[4] )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
const GLfloat color[4] )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
@@
-833,7
+829,7
@@
static void tdfxDDClearColor( GLcontext *ctx,
* Light Model
*/
* Light Model
*/
-static void tdfxDDLightModelfv(
GL
context *ctx, GLenum pname,
+static void tdfxDDLightModelfv(
struct gl_
context *ctx, GLenum pname,
const GLfloat *param )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
const GLfloat *param )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
@@
-845,7
+841,7
@@
static void tdfxDDLightModelfv( GLcontext *ctx, GLenum pname,
}
}
}
}
-static void tdfxDDShadeModel(
GL
context *ctx, GLenum mode )
+static void tdfxDDShadeModel(
struct gl_
context *ctx, GLenum mode )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
@@
-860,7
+856,7
@@
static void tdfxDDShadeModel( GLcontext *ctx, GLenum mode )
*/
static void
*/
static void
-tdfxDDScissor(
GL
context * ctx, GLint x, GLint y, GLsizei w, GLsizei h)
+tdfxDDScissor(
struct gl_
context * ctx, GLint x, GLint y, GLsizei w, GLsizei h)
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
FLUSH_BATCH( fxMesa );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
FLUSH_BATCH( fxMesa );
@@
-871,7
+867,7
@@
tdfxDDScissor(GLcontext * ctx, GLint x, GLint y, GLsizei w, GLsizei h)
* Render
*/
* Render
*/
-static void tdfxUpdateRenderAttrib(
GL
context *ctx )
+static void tdfxUpdateRenderAttrib(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
FLUSH_BATCH( fxMesa );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
FLUSH_BATCH( fxMesa );
@@
-882,7
+878,7
@@
static void tdfxUpdateRenderAttrib( GLcontext *ctx )
* Viewport
*/
* Viewport
*/
-void tdfxUpdateViewport(
GL
context *ctx )
+void tdfxUpdateViewport(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
const GLfloat *v = ctx->Viewport._WindowMap.m;
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
const GLfloat *v = ctx->Viewport._WindowMap.m;
@@
-899,7
+895,7
@@
void tdfxUpdateViewport( GLcontext *ctx )
}
}
-static void tdfxDDViewport(
GL
context *ctx, GLint x, GLint y,
+static void tdfxDDViewport(
struct gl_
context *ctx, GLint x, GLint y,
GLsizei w, GLsizei h )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
GLsizei w, GLsizei h )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
@@
-908,7
+904,7
@@
static void tdfxDDViewport( GLcontext *ctx, GLint x, GLint y,
}
}
-static void tdfxDDDepthRange(
GL
context *ctx, GLclampd nearVal, GLclampd farVal )
+static void tdfxDDDepthRange(
struct gl_
context *ctx, GLclampd nearVal, GLclampd farVal )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
FLUSH_BATCH( fxMesa );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
FLUSH_BATCH( fxMesa );
@@
-920,7
+916,7
@@
static void tdfxDDDepthRange( GLcontext *ctx, GLclampd nearVal, GLclampd farVal
* State enable/disable
*/
* State enable/disable
*/
-static void tdfxDDEnable(
GL
context *ctx, GLenum cap, GLboolean state )
+static void tdfxDDEnable(
struct gl_
context *ctx, GLenum cap, GLboolean state )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT( ctx );
@@
-1021,7
+1017,7
@@
static void tdfxDDEnable( GLcontext *ctx, GLenum cap, GLboolean state )
/* Set the buffer used for drawing */
/* XXX support for separate read/draw buffers hasn't been tested */
/* Set the buffer used for drawing */
/* XXX support for separate read/draw buffers hasn't been tested */
-static void tdfxDDDrawBuffer(
GL
context *ctx, GLenum mode )
+static void tdfxDDDrawBuffer(
struct gl_
context *ctx, GLenum mode )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
@@
-1058,7
+1054,7
@@
static void tdfxDDDrawBuffer( GLcontext *ctx, GLenum mode )
}
}
-static void tdfxDDReadBuffer(
GL
context *ctx, GLenum mode )
+static void tdfxDDReadBuffer(
struct gl_
context *ctx, GLenum mode )
{
/* XXX ??? */
}
{
/* XXX ??? */
}
@@
-1068,7
+1064,7
@@
static void tdfxDDReadBuffer( GLcontext *ctx, GLenum mode )
* Polygon stipple
*/
* Polygon stipple
*/
-static void tdfxDDPolygonStipple(
GL
context *ctx, const GLubyte *mask )
+static void tdfxDDPolygonStipple(
struct gl_
context *ctx, const GLubyte *mask )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
const GLubyte *m = mask;
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
const GLubyte *m = mask;
@@
-1123,7
+1119,7
@@
static void tdfxDDPolygonStipple( GLcontext *ctx, const GLubyte *mask )
-static void tdfxDDRenderMode(
GL
context *ctx, GLenum mode )
+static void tdfxDDRenderMode(
struct gl_
context *ctx, GLenum mode )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
FALLBACK( fxMesa, TDFX_FALLBACK_RENDER_MODE, (mode != GL_RENDER) );
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
FALLBACK( fxMesa, TDFX_FALLBACK_RENDER_MODE, (mode != GL_RENDER) );
@@
-1154,7
+1150,7
@@
static void tdfxDDPrintState( const char *msg, GLuint flags )
-void tdfxDDUpdateHwState(
GL
context *ctx )
+void tdfxDDUpdateHwState(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
int new_state = fxMesa->new_state;
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
int new_state = fxMesa->new_state;
@@
-1230,7
+1226,7
@@
void tdfxDDUpdateHwState( GLcontext *ctx )
}
}
-static void tdfxDDInvalidateState(
GL
context *ctx, GLuint new_state )
+static void tdfxDDInvalidateState(
struct gl_
context *ctx, GLuint new_state )
{
_swrast_InvalidateState( ctx, new_state );
_swsetup_InvalidateState( ctx, new_state );
{
_swrast_InvalidateState( ctx, new_state );
_swsetup_InvalidateState( ctx, new_state );
@@
-1246,7
+1242,7
@@
static void tdfxDDInvalidateState( GLcontext *ctx, GLuint new_state )
*/
void tdfxInitState( tdfxContextPtr fxMesa )
{
*/
void tdfxInitState( tdfxContextPtr fxMesa )
{
-
GL
context *ctx = fxMesa->glCtx;
+
struct gl_
context *ctx = fxMesa->glCtx;
GLint i;
fxMesa->ColorCombine.Function = GR_COMBINE_FUNCTION_LOCAL;
GLint i;
fxMesa->ColorCombine.Function = GR_COMBINE_FUNCTION_LOCAL;
@@
-1394,7
+1390,7
@@
void tdfxInitState( tdfxContextPtr fxMesa )
-void tdfxDDInitStateFuncs(
GL
context *ctx )
+void tdfxDDInitStateFuncs(
struct gl_
context *ctx )
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
{
tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);