projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'gallium-vertexelementcso'
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_context.c
diff --git
a/src/mesa/state_tracker/st_context.c
b/src/mesa/state_tracker/st_context.c
index 0329e0cef09e389b42df5d9bdb77ba988df06784..0358a70726123082e7d4b3f48622daff910443f5 100644
(file)
--- a/
src/mesa/state_tracker/st_context.c
+++ b/
src/mesa/state_tracker/st_context.c
@@
-56,7
+56,6
@@
#include "st_cb_texture.h"
#include "st_cb_flush.h"
#include "st_cb_strings.h"
#include "st_cb_texture.h"
#include "st_cb_flush.h"
#include "st_cb_strings.h"
-#include "st_cb_viewport.h"
#include "st_atom.h"
#include "st_draw.h"
#include "st_extensions.h"
#include "st_atom.h"
#include "st_draw.h"
#include "st_extensions.h"
@@
-231,7
+230,7
@@
static void st_destroy_context_priv( struct st_context *st )
st->default_texture = NULL;
}
st->default_texture = NULL;
}
-
_mesa_
free( st );
+ free( st );
}
}
@@
-266,7
+265,7
@@
void st_destroy_context( struct st_context *st )
pipe->destroy( pipe );
pipe->destroy( pipe );
-
_mesa_
free(ctx);
+ free(ctx);
}
}
@@
-351,7
+350,6
@@
void st_init_driver_functions(struct dd_function_table *functions)
st_init_texture_functions(functions);
st_init_flush_functions(functions);
st_init_string_functions(functions);
st_init_texture_functions(functions);
st_init_flush_functions(functions);
st_init_string_functions(functions);
- st_init_viewport_functions(functions);
functions->UpdateState = st_invalidate_state;
}
functions->UpdateState = st_invalidate_state;
}