projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Clean up brw_prepare_vertices()
[mesa.git]
/
src
/
mesa
/
main
/
atifragshader.c
diff --git
a/src/mesa/main/atifragshader.c
b/src/mesa/main/atifragshader.c
index 550f50b7a00fbe5fabbb8cfb6b8dc38acb560a74..44097e1a266059bf26d695326d802755cce232a1 100644
(file)
--- a/
src/mesa/main/atifragshader.c
+++ b/
src/mesa/main/atifragshader.c
@@
-26,6
+26,7
@@
#include "main/hash.h"
#include "main/imports.h"
#include "main/macros.h"
#include "main/hash.h"
#include "main/imports.h"
#include "main/macros.h"
+#include "main/mfeatures.h"
#include "main/enums.h"
#include "main/mtypes.h"
#include "main/dispatch.h"
#include "main/enums.h"
#include "main/mtypes.h"
#include "main/dispatch.h"
@@
-62,7
+63,7
@@
_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
* Allocate and initialize a new ATI fragment shader object.
*/
struct ati_fragment_shader *
* Allocate and initialize a new ATI fragment shader object.
*/
struct ati_fragment_shader *
-_mesa_new_ati_fragment_shader(
GL
context *ctx, GLuint id)
+_mesa_new_ati_fragment_shader(
struct gl_
context *ctx, GLuint id)
{
struct ati_fragment_shader *s = CALLOC_STRUCT(ati_fragment_shader);
(void) ctx;
{
struct ati_fragment_shader *s = CALLOC_STRUCT(ati_fragment_shader);
(void) ctx;
@@
-78,7
+79,7
@@
_mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id)
* Delete the given ati fragment shader
*/
void
* Delete the given ati fragment shader
*/
void
-_mesa_delete_ati_fragment_shader(
GL
context *ctx, struct ati_fragment_shader *s)
+_mesa_delete_ati_fragment_shader(
struct gl_
context *ctx, struct ati_fragment_shader *s)
{
GLuint i;
for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {
{
GLuint i;
for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {
@@
-316,6
+317,7
@@
_mesa_DeleteFragmentShaderATI(GLuint id)
if (prog) {
prog->RefCount--;
if (prog->RefCount <= 0) {
if (prog) {
prog->RefCount--;
if (prog->RefCount <= 0) {
+ assert(prog != &DummyShader);
free(prog);
}
}
free(prog);
}
}