OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: stop passing state bitfield to UpdateState()

Browse Source 
The code comment which seems to have been added in cab974cf6c
(from year 2000) says:

   "Set ctx->NewState to zero to avoid recursion if
   Driver.UpdateState() has to call FLUSH_VERTICES().  (fixed?)"

As far as I can tell nothing in any of the UpdateState() calls
should cause it to be called recursively.

V2: add a wrapper around the osmesa update function so it can still
    be used internally.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Timothy Arceri
2017-06-07 12:19:13 +10:00
parent f627ac6e35
commit f77740f14b
13 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/drivers/osmesa/osmesa.c
View File

@@ -117,7 +117,7 @@ get_string( struct gl_context *ctx, GLenum name )
static void
osmesa_update_state( struct gl_context *ctx, GLuint new_state )
osmesa_update_state(struct gl_context *ctx, GLuint new_state)
{
/* easy - just propogate */
_swrast_InvalidateState( ctx, new_state );
@@ -126,6 +126,11 @@ osmesa_update_state( struct gl_context *ctx, GLuint new_state )
_vbo_InvalidateState( ctx, new_state );
}
static void
osmesa_update_state_wrapper(struct gl_context *ctx)
{
osmesa_update_state(ctx, ctx->NewState);
}
/**
@@ -828,7 +833,7 @@ OSMesaCreateContextAttribs(const int *attribList, OSMesaContext sharelist)
_mesa_init_driver_functions(&functions);
/* override with our functions */
functions.GetString = get_string;
functions.UpdateState = osmesa_update_state;
functions.UpdateState = osmesa_update_state_wrapper;
if (!_mesa_initialize_context(&osmesa->mesa,
api_profile,