projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dri/nouveau: Kill a bunch of ternary operators.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
mach64
/
mach64_tex.c
diff --git
a/src/mesa/drivers/dri/mach64/mach64_tex.c
b/src/mesa/drivers/dri/mach64/mach64_tex.c
index 6627d3c38a05b82e1261186428a5dbe061c54811..68d273a3e7556c825bdcda15bbea3ad6f64763f0 100644
(file)
--- a/
src/mesa/drivers/dri/mach64/mach64_tex.c
+++ b/
src/mesa/drivers/dri/mach64/mach64_tex.c
@@
-31,13
+31,8
@@
#include "mach64_context.h"
#include "mach64_ioctl.h"
#include "mach64_context.h"
#include "mach64_ioctl.h"
-#include "mach64_state.h"
-#include "mach64_vb.h"
-#include "mach64_tris.h"
#include "mach64_tex.h"
#include "mach64_tex.h"
-#include "main/context.h"
-#include "main/macros.h"
#include "main/simple_list.h"
#include "main/enums.h"
#include "main/texstore.h"
#include "main/simple_list.h"
#include "main/enums.h"
#include "main/texstore.h"
@@
-138,7
+133,7
@@
mach64AllocTexObj( struct gl_texture_object *texObj )
/* Called by the _mesa_store_teximage[123]d() functions. */
static gl_format
/* Called by the _mesa_store_teximage[123]d() functions. */
static gl_format
-mach64ChooseTextureFormat(
GL
context *ctx, GLint internalFormat,
+mach64ChooseTextureFormat(
struct gl_
context *ctx, GLint internalFormat,
GLenum format, GLenum type )
{
mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
GLenum format, GLenum type )
{
mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
@@
-246,7
+241,7
@@
mach64ChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
}
}
}
}
-static void mach64TexImage1D(
GL
context *ctx, GLenum target, GLint level,
+static void mach64TexImage1D(
struct gl_
context *ctx, GLenum target, GLint level,
GLint internalFormat,
GLint width, GLint border,
GLenum format, GLenum type, const GLvoid *pixels,
GLint internalFormat,
GLint width, GLint border,
GLenum format, GLenum type, const GLvoid *pixels,
@@
-276,7
+271,7
@@
static void mach64TexImage1D( GLcontext *ctx, GLenum target, GLint level,
mmesa->new_state |= MACH64_NEW_TEXTURE;
}
mmesa->new_state |= MACH64_NEW_TEXTURE;
}
-static void mach64TexSubImage1D(
GL
context *ctx,
+static void mach64TexSubImage1D(
struct gl_
context *ctx,
GLenum target,
GLint level,
GLint xoffset,
GLenum target,
GLint level,
GLint xoffset,
@@
-309,7
+304,7
@@
static void mach64TexSubImage1D( GLcontext *ctx,
mmesa->new_state |= MACH64_NEW_TEXTURE;
}
mmesa->new_state |= MACH64_NEW_TEXTURE;
}
-static void mach64TexImage2D(
GL
context *ctx, GLenum target, GLint level,
+static void mach64TexImage2D(
struct gl_
context *ctx, GLenum target, GLint level,
GLint internalFormat,
GLint width, GLint height, GLint border,
GLenum format, GLenum type, const GLvoid *pixels,
GLint internalFormat,
GLint width, GLint height, GLint border,
GLenum format, GLenum type, const GLvoid *pixels,
@@
-339,7
+334,7
@@
static void mach64TexImage2D( GLcontext *ctx, GLenum target, GLint level,
mmesa->new_state |= MACH64_NEW_TEXTURE;
}
mmesa->new_state |= MACH64_NEW_TEXTURE;
}
-static void mach64TexSubImage2D(
GL
context *ctx,
+static void mach64TexSubImage2D(
struct gl_
context *ctx,
GLenum target,
GLint level,
GLint xoffset, GLint yoffset,
GLenum target,
GLint level,
GLint xoffset, GLint yoffset,
@@
-376,7
+371,7
@@
static void mach64TexSubImage2D( GLcontext *ctx,
* Device Driver API texture functions
*/
* Device Driver API texture functions
*/
-static void mach64DDTexEnv(
GL
context *ctx, GLenum target,
+static void mach64DDTexEnv(
struct gl_
context *ctx, GLenum target,
GLenum pname, const GLfloat *param )
{
mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
GLenum pname, const GLfloat *param )
{
mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
@@
-430,7
+425,7
@@
static void mach64DDTexEnv( GLcontext *ctx, GLenum target,
}
}
}
}
-static void mach64DDTexParameter(
GL
context *ctx, GLenum target,
+static void mach64DDTexParameter(
struct gl_
context *ctx, GLenum target,
struct gl_texture_object *tObj,
GLenum pname, const GLfloat *params )
{
struct gl_texture_object *tObj,
GLenum pname, const GLfloat *params )
{
@@
-494,7
+489,7
@@
static void mach64DDTexParameter( GLcontext *ctx, GLenum target,
mmesa->new_state |= MACH64_NEW_TEXTURE;
}
mmesa->new_state |= MACH64_NEW_TEXTURE;
}
-static void mach64DDBindTexture(
GL
context *ctx, GLenum target,
+static void mach64DDBindTexture(
struct gl_
context *ctx, GLenum target,
struct gl_texture_object *tObj )
{
mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
struct gl_texture_object *tObj )
{
mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
@@
-515,7
+510,7
@@
static void mach64DDBindTexture( GLcontext *ctx, GLenum target,
mmesa->new_state |= MACH64_NEW_TEXTURE;
}
mmesa->new_state |= MACH64_NEW_TEXTURE;
}
-static void mach64DDDeleteTexture(
GL
context *ctx,
+static void mach64DDDeleteTexture(
struct gl_
context *ctx,
struct gl_texture_object *tObj )
{
mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
struct gl_texture_object *tObj )
{
mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
@@
-542,7
+537,7
@@
static void mach64DDDeleteTexture( GLcontext *ctx,
* texture object from the core mesa gl_texture_object. Not done at this time.
*/
static struct gl_texture_object *
* texture object from the core mesa gl_texture_object. Not done at this time.
*/
static struct gl_texture_object *
-mach64NewTextureObject(
GL
context *ctx, GLuint name, GLenum target )
+mach64NewTextureObject(
struct gl_
context *ctx, GLuint name, GLenum target )
{
struct gl_texture_object *obj;
obj = _mesa_new_texture_object(ctx, name, target);
{
struct gl_texture_object *obj;
obj = _mesa_new_texture_object(ctx, name, target);
@@
-564,7
+559,5
@@
void mach64InitTextureFuncs( struct dd_function_table *functions )
functions->DeleteTexture = mach64DDDeleteTexture;
functions->IsTextureResident = driIsTextureResident;
functions->DeleteTexture = mach64DDDeleteTexture;
functions->IsTextureResident = driIsTextureResident;
- functions->UpdateTexturePalette = NULL;
-
driInitTextureFormats();
}
driInitTextureFormats();
}