[Mesa-dev] [PATCH 1/8] r200/radeon: stop calling _ae_invalidate_state() directly

[Timothy Arceri]

On 09/06/17 08:28, Ian Romanick wrote:
> I'm going to tagging changes in src/mesa/drivers/dri/radeon with r100:
> to prevent confusion with the Gallium radeon: tags.

No problem, I will do this in future also.

> 
> I tested this patch on RV250 (1002:4c66), and there were no piglit changes.
> 
> Tested-by: Ian Romanick <ian.d.romanick at intel.com>

Thanks!

> 
> On 06/06/2017 11:01 PM, Timothy Arceri wrote:
>> It is already called via _vbo_InvalidateState().
>> ---
>>   src/mesa/drivers/dri/r200/r200_state.c     | 2 --
>>   src/mesa/drivers/dri/radeon/radeon_state.c | 2 --
>>   2 files changed, 4 deletions(-)
>>
>> diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
>> index 86733a8..9fb15f2 100644
>> --- a/src/mesa/drivers/dri/r200/r200_state.c
>> +++ b/src/mesa/drivers/dri/r200/r200_state.c
>> @@ -28,21 +28,20 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>>   
>>   **************************************************************************/
>>   
>>   /*
>>    * Authors:
>>    *   Keith Whitwell <keithw at vmware.com>
>>    */
>>   
>>   #include "main/glheader.h"
>>   #include "main/imports.h"
>> -#include "main/api_arrayelt.h"
>>   #include "main/enums.h"
>>   #include "main/light.h"
>>   #include "main/framebuffer.h"
>>   #include "main/fbobject.h"
>>   #include "main/stencil.h"
>>   #include "main/viewport.h"
>>   
>>   #include "swrast/swrast.h"
>>   #include "vbo/vbo.h"
>>   #include "tnl/tnl.h"
>> @@ -2278,21 +2277,20 @@ GLboolean r200ValidateState( struct gl_context *ctx )
>>   
>>   
>>   static void r200InvalidateState( struct gl_context *ctx, GLuint new_state )
>>   {
>>      r200ContextPtr rmesa = R200_CONTEXT(ctx);
>>   
>>      _swrast_InvalidateState( ctx, new_state );
>>      _swsetup_InvalidateState( ctx, new_state );
>>      _vbo_InvalidateState( ctx, new_state );
>>      _tnl_InvalidateState( ctx, new_state );
>> -   _ae_invalidate_state( ctx, new_state );
>>      R200_CONTEXT(ctx)->radeon.NewGLState |= new_state;
>>   
>>      if (new_state & _NEW_PROGRAM)
>>         rmesa->curr_vp_hw = NULL;
>>   }
>>   
>>   /* A hack.  The r200 can actually cope just fine with materials
>>    * between begin/ends, so fix this.
>>    * Should map to inputs just like the generic vertex arrays for vertex progs.
>>    * In theory there could still be too many and we'd still need a fallback.
>> diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
>> index c6b1f38..1baf229 100644
>> --- a/src/mesa/drivers/dri/radeon/radeon_state.c
>> +++ b/src/mesa/drivers/dri/radeon/radeon_state.c
>> @@ -27,21 +27,20 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>>   **************************************************************************/
>>   
>>   /*
>>    * Authors:
>>    *   Gareth Hughes <gareth at valinux.com>
>>    *   Keith Whitwell <keithw at vmware.com>
>>    */
>>   
>>   #include "main/glheader.h"
>>   #include "main/imports.h"
>> -#include "main/api_arrayelt.h"
>>   #include "main/enums.h"
>>   #include "main/light.h"
>>   #include "main/context.h"
>>   #include "main/framebuffer.h"
>>   #include "main/fbobject.h"
>>   #include "util/simple_list.h"
>>   #include "main/state.h"
>>   #include "main/core.h"
>>   #include "main/stencil.h"
>>   #include "main/viewport.h"
>> @@ -2044,21 +2043,20 @@ GLboolean radeonValidateState( struct gl_context *ctx )
>>      return GL_TRUE;
>>   }
>>   
>>   
>>   static void radeonInvalidateState( struct gl_context *ctx, GLuint new_state )
>>   {
>>      _swrast_InvalidateState( ctx, new_state );
>>      _swsetup_InvalidateState( ctx, new_state );
>>      _vbo_InvalidateState( ctx, new_state );
>>      _tnl_InvalidateState( ctx, new_state );
>> -   _ae_invalidate_state( ctx, new_state );
>>      R100_CONTEXT(ctx)->radeon.NewGLState |= new_state;
>>   }
>>   
>>   
>>   /* A hack.  Need a faster way to find this out.
>>    */
>>   static GLboolean check_material( struct gl_context *ctx )
>>   {
>>      TNLcontext *tnl = TNL_CONTEXT(ctx);
>>      GLint i;
>>
>