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

r200: remove BindProgram

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 23:54:52 +01:00
parent bbb5561007
commit e81ee82119
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/drivers/dri/r200/r200_state.c
View file

@ -2279,12 +2279,17 @@ 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

16
src/mesa/drivers/dri/r200/r200_vertprog.c
View file

@ -1183,21 +1183,6 @@ void r200SetupVertexProg( struct gl_context *ctx ) {
}
static void
r200BindProgram(struct gl_context *ctx, GLenum target, struct gl_program *prog)
{
r200ContextPtr rmesa = R200_CONTEXT(ctx);
switch(target){
case GL_VERTEX_PROGRAM_ARB:
rmesa->curr_vp_hw = NULL;
break;
default:
_mesa_problem(ctx, "Target not supported yet!");
break;
}
}
static struct gl_program *
r200NewProgram(struct gl_context *ctx, GLenum target, GLuint id,
bool is_arb_asm)
@ -1271,7 +1256,6 @@ r200IsProgramNative(struct gl_context *ctx, GLenum target, struct gl_program *pr
void r200InitShaderFuncs(struct dd_function_table *functions)
{
functions->NewProgram = r200NewProgram;
functions->BindProgram = r200BindProgram;
functions->DeleteProgram = r200DeleteProgram;
functions->ProgramStringNotify = r200ProgramStringNotify;
functions->IsProgramNative = r200IsProgramNative;