diff options
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_tex.c | 10 | ||||
-rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_tex.h | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c index 9942166de67..e4240afc4d1 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_tex.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.c @@ -442,7 +442,7 @@ tdfxTexParameter(GLcontext * ctx, GLenum target, * Called via glDeleteTextures to delete a texture object. * Here, we delete the Glide data associated with the texture. */ -void +static void tdfxDeleteTexture(GLcontext * ctx, struct gl_texture_object *tObj) { if (ctx && ctx->DriverCtx) { @@ -458,7 +458,7 @@ tdfxDeleteTexture(GLcontext * ctx, struct gl_texture_object *tObj) /* * Return true if texture is resident, false otherwise. */ -GLboolean +static GLboolean tdfxIsTextureResident(GLcontext *ctx, struct gl_texture_object *tObj) { tdfxTexInfo *ti = TDFX_TEXTURE_DATA(tObj); @@ -859,7 +859,7 @@ fetch_a8r8g8b8(const struct gl_texture_image *texImage, } -static FetchTexelFunc +static FetchTexelFuncC fxFetchFunction(GLint mesaFormat) { switch (mesaFormat) { @@ -951,7 +951,7 @@ tdfxTexImage2D(GLcontext *ctx, GLenum target, GLint level, assert(texImage->TexFormat); mml->glideFormat = fxGlideFormat(texImage->TexFormat->MesaFormat); ti->info.format = mml->glideFormat; - texImage->FetchTexel = fxFetchFunction(texImage->TexFormat->MesaFormat); + texImage->FetchTexelc = fxFetchFunction(texImage->TexFormat->MesaFormat); texelBytes = texImage->TexFormat->TexelBytes; if (mml->width != width || mml->height != height) { @@ -1497,5 +1497,7 @@ void tdfxInitTextureFuncs( struct dd_function_table *functions ) functions->ChooseTextureFormat = tdfxChooseTextureFormat; functions->TexImage2D = tdfxTexImage2D; functions->TexSubImage2D = tdfxTexSubImage2D; + functions->IsTextureResident = tdfxIsTextureResident; + functions->UpdateTexturePalette = tdfxTexturePalette; } diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.h b/src/mesa/drivers/dri/tdfx/tdfx_tex.h index 29872e76471..cbd9bd04682 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_tex.h +++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.h @@ -69,7 +69,7 @@ fxDDTexUseGlobalPalette(GLcontext * ctx, GLboolean state); #endif extern GLboolean -tdfxDDTestProxyTexImage(GLcontext *ctx, GLenum target, +tdfxTestProxyTexImage(GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLenum format, GLenum type, GLint width, GLint height, @@ -88,12 +88,12 @@ tdfxDDGetCompressedTexImage( GLcontext *ctx, GLenum target, struct gl_texture_image *texImage ); extern GLint -tdfxDDSpecificCompressedTexFormat(GLcontext *ctx, +tdfxSpecificCompressedTexFormat(GLcontext *ctx, GLint internalFormat, GLint numDimensions); extern GLint -tdfxDDBaseCompressedTexFormat(GLcontext *ctx, +tdfxBaseCompressedTexFormat(GLcontext *ctx, GLint internalFormat); extern GLboolean |