Mesa (master): i915g: Check for geometry shader earlier in i915_set_constant_buffer.
Vinson Lee
vlee at kemper.freedesktop.org
Fri May 25 01:50:55 UTC 2012
Module: Mesa
Branch: master
Commit: 35f302d97e5b6f5fc4964e70f7adae706c5b7162
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=35f302d97e5b6f5fc4964e70f7adae706c5b7162
Author: Vinson Lee <vlee at freedesktop.org>
Date: Wed May 23 22:36:47 2012 -0700
i915g: Check for geometry shader earlier in i915_set_constant_buffer.
Fix resource leak defect reported by Coverity.
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/gallium/drivers/i915/i915_state.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index bd9e8ba..1ff5388 100644
--- a/src/gallium/drivers/i915/i915_state.c
+++ b/src/gallium/drivers/i915/i915_state.c
@@ -672,16 +672,16 @@ static void i915_set_constant_buffer(struct pipe_context *pipe,
unsigned new_num = 0;
boolean diff = TRUE;
+ /* XXX don't support geom shaders now */
+ if (shader == PIPE_SHADER_GEOMETRY)
+ return;
+
if (cb && cb->user_buffer) {
buf = i915_user_buffer_create(pipe->screen, cb->user_buffer,
cb->buffer_size,
PIPE_BIND_CONSTANT_BUFFER);
}
- /* XXX don't support geom shaders now */
- if (shader == PIPE_SHADER_GEOMETRY)
- return;
-
/* if we have a new buffer compare it with the old one */
if (buf) {
struct i915_buffer *ibuf = i915_buffer(buf);
More information about the mesa-commit
mailing list