projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: fix MSVC signed/unsigned warnings in context.c
[mesa.git]
/
src
/
mesa
/
main
/
texstate.h
diff --git
a/src/mesa/main/texstate.h
b/src/mesa/main/texstate.h
index 17ac68000c5092515c2602fff148ab92bd38170a..7dc6dc6a2cd845cfef197448f90acd9c7694dba6 100644
(file)
--- a/
src/mesa/main/texstate.h
+++ b/
src/mesa/main/texstate.h
@@
-32,6
+32,7
@@
#define TEXSTATE_H
#define TEXSTATE_H
+#include "compiler.h"
#include "mtypes.h"
#include "mtypes.h"
@@
-39,8
+40,8
@@
* Return pointer to current texture unit.
* This the texture unit set by glActiveTexture(), not glClientActiveTexture().
*/
* Return pointer to current texture unit.
* This the texture unit set by glActiveTexture(), not glClientActiveTexture().
*/
-static
INLINE
struct gl_texture_unit *
-_mesa_get_current_tex_unit(
GL
context *ctx)
+static
inline
struct gl_texture_unit *
+_mesa_get_current_tex_unit(
struct gl_
context *ctx)
{
ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
{
ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
@@
-48,10
+49,10
@@
_mesa_get_current_tex_unit(GLcontext *ctx)
extern void
extern void
-_mesa_copy_texture_state( const
GLcontext *src, GL
context *dst );
+_mesa_copy_texture_state( const
struct gl_context *src, struct gl_
context *dst );
extern void
extern void
-_mesa_print_texunit_state(
GL
context *ctx, GLuint unit );
+_mesa_print_texunit_state(
struct gl_
context *ctx, GLuint unit );
@@
-75,16
+76,16
@@
_mesa_ClientActiveTextureARB( GLenum target );
/*@{*/
extern void
/*@{*/
extern void
-_mesa_update_texture(
GL
context *ctx, GLuint new_state );
+_mesa_update_texture(
struct gl_
context *ctx, GLuint new_state );
extern GLboolean
extern GLboolean
-_mesa_init_texture(
GL
context *ctx );
+_mesa_init_texture(
struct gl_
context *ctx );
extern void
extern void
-_mesa_free_texture_data(
GL
context *ctx );
+_mesa_free_texture_data(
struct gl_
context *ctx );
extern void
extern void
-_mesa_update_default_objects_texture(
GL
context *ctx);
+_mesa_update_default_objects_texture(
struct gl_
context *ctx);
/*@}*/
/*@}*/