fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: inline _mesa_update_texture

Browse source 
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2017-03-23 22:35:03 +01:00
parent bb9faba172
commit 226ff6aa30
3 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/main/state.c
View file

@ -406,8 +406,11 @@ _mesa_update_state_locked( struct gl_context *ctx )
if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION))
_mesa_update_modelview_project( ctx, new_state );
if (new_state & (_NEW_PROGRAM|_NEW_TEXTURE|_NEW_TEXTURE_MATRIX))
_mesa_update_texture( ctx, new_state );
if (new_state & _NEW_TEXTURE_MATRIX)
_mesa_update_texture_matrices(ctx);
if (new_state & (_NEW_TEXTURE | _NEW_PROGRAM))
_mesa_update_texture_state(ctx);
if (new_state & _NEW_POLYGON)
update_frontbit( ctx );

22
src/mesa/main/texstate.c
View file

@ -355,8 +355,8 @@ _mesa_ClientActiveTexture(GLenum texture)
*
* \param ctx GL context.
*/
static void
update_texture_matrices( struct gl_context *ctx )
void
_mesa_update_texture_matrices(struct gl_context *ctx)
{
GLuint u;
@ -691,8 +691,8 @@ update_ff_texture_state(struct gl_context *ctx,
*
* \param ctx GL context.
*/
static void
update_texture_state( struct gl_context *ctx )
void
_mesa_update_texture_state(struct gl_context *ctx)
{
struct gl_program *prog[MESA_SHADER_STAGES];
int i;
@ -747,20 +747,6 @@ update_texture_state( struct gl_context *ctx )
}
/**
* Update texture-related derived state.
*/
void
_mesa_update_texture( struct gl_context *ctx, GLuint new_state )
{
if (new_state & _NEW_TEXTURE_MATRIX)
update_texture_matrices( ctx );
if (new_state & (_NEW_TEXTURE | _NEW_PROGRAM))
update_texture_state( ctx );
}
/**********************************************************************/
/***** Initialization *****/
/**********************************************************************/

7
src/mesa/main/texstate.h
View file

@ -91,8 +91,11 @@ _mesa_ClientActiveTexture( GLenum target );
*/
/*@{*/
extern void
_mesa_update_texture( struct gl_context *ctx, GLuint new_state );
extern void
_mesa_update_texture_matrices(struct gl_context *ctx);
extern void
_mesa_update_texture_state(struct gl_context *ctx);
extern GLboolean
_mesa_init_texture( struct gl_context *ctx );