projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel/compiler: Test compaction on Gen <= 12
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_xformfb.c
diff --git
a/src/mesa/state_tracker/st_cb_xformfb.c
b/src/mesa/state_tracker/st_cb_xformfb.c
index 0c01cd5ab785cb2c6c8e2131351ef38530323533..476eb9be02bc0d4eb7b2996cf7763123ded0bf4c 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_xformfb.c
+++ b/
src/mesa/state_tracker/st_cb_xformfb.c
@@
-96,11
+96,7
@@
st_delete_transform_feedback(struct gl_context *ctx,
pipe_so_target_reference(&sobj->targets[i], NULL);
}
pipe_so_target_reference(&sobj->targets[i], NULL);
}
- for (i = 0; i < ARRAY_SIZE(sobj->base.Buffers); i++) {
- _mesa_reference_buffer_object(ctx, &sobj->base.Buffers[i], NULL);
- }
-
- free(obj);
+ _mesa_delete_transform_feedback_object(ctx, obj);
}
}
@@
-124,8
+120,8
@@
st_begin_transform_feedback(struct gl_context *ctx, GLenum mode,
struct st_buffer_object *bo = st_buffer_object(sobj->base.Buffers[i]);
if (bo && bo->buffer) {
struct st_buffer_object *bo = st_buffer_object(sobj->base.Buffers[i]);
if (bo && bo->buffer) {
- unsigned stream =
-
obj->shader_program->LinkedTransformFeedback.BufferStream[i]
;
+ unsigned stream =
obj->program->sh.LinkedTransformFeedback->
+
Buffers[i].Stream
;
/* Check whether we need to recreate the target. */
if (!sobj->targets[i] ||
/* Check whether we need to recreate the target. */
if (!sobj->targets[i] ||
@@
-203,8
+199,8
@@
st_end_transform_feedback(struct gl_context *ctx,
pipe_so_target_reference(&sobj->draw_count[i], NULL);
for (i = 0; i < ARRAY_SIZE(sobj->targets); i++) {
pipe_so_target_reference(&sobj->draw_count[i], NULL);
for (i = 0; i < ARRAY_SIZE(sobj->targets); i++) {
- unsigned stream =
-
obj->shader_program->LinkedTransformFeedback.BufferStream[i]
;
+ unsigned stream =
obj->program->sh.LinkedTransformFeedback->
+
Buffers[i].Stream
;
/* Is it not bound or already set for this stream? */
if (!sobj->targets[i] || sobj->draw_count[stream])
/* Is it not bound or already set for this stream? */
if (!sobj->targets[i] || sobj->draw_count[stream])