Mesa (master): gallivm: Fix calculating rho for 3d textures for the single-quad case
Module: Mesa
Branch: master
Commit: dfbb18bdb58fa04ddd4cbd495299a704599ee09e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dfbb18bdb58fa04ddd4cbd495299a704599ee09e
Author: Roland Scheidegger srol...@vmware.com
Date: Thu May 24 21:05:13 2012 +0200
gallivm: Fix calculating rho for 3d textures for the single-quad case
Discovered by accident, this looks like a very old typo bug.
Signed-off-by: José Fonseca jfons...@vmware.com
---
src/gallium/auxiliary/gallivm/lp_bld_sample.c |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.c
b/src/gallium/auxiliary/gallivm/lp_bld_sample.c
index 2ffd9b8..d966788 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.c
@@ -256,9 +256,8 @@ lp_build_rho(struct lp_build_sample_context *bld,
rho_t = LLVMBuildExtractElement(builder, rho_vec, index1, );
rho = lp_build_max(float_bld, rho_s, rho_t);
-
if (dims = 3) {
-rho_r = LLVMBuildExtractElement(builder, rho_vec, index0, );
+rho_r = LLVMBuildExtractElement(builder, rho_vec, index2, );
rho = lp_build_max(float_bld, rho, rho_r);
}
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glapi: .gitignore cleanup
Module: Mesa Branch: master Commit: 6224e902473b3204425179990c3bb2bc274daba8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6224e902473b3204425179990c3bb2bc274daba8 Author: Andreas Boll andreas.boll@gmail.com Date: Fri Jun 8 19:55:50 2012 +0200 glapi: .gitignore cleanup remove archaic .cvsignore *.pyo is already in toplevel .gitignore *.pyc is already in toplevel .gitignore Reviewed-by: Kenneth Graunke kenn...@whitecape.org --- src/mapi/glapi/.gitignore | 11 --- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/src/mapi/glapi/.gitignore b/src/mapi/glapi/.gitignore index 21edf4f..ecae56a 100644 --- a/src/mapi/glapi/.gitignore +++ b/src/mapi/glapi/.gitignore @@ -1,14 +1,3 @@ -.cvsignore -glX_proto_common.pyo -glX_proto_common.pyc -typeexpr.pyo -typeexpr.pyc -license.pyo -license.pyc -gl_XML.pyo -gl_XML.pyc -glX_XML.pyo -glX_XML.pyc glapi_gentable.c glapi_gentable.h glapi_mapi_tmp.h ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glcpp: .gitignore cleanup
Module: Mesa Branch: master Commit: ca9977d5c6f8e6ff8290bdf094d978487519d6f5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca9977d5c6f8e6ff8290bdf094d978487519d6f5 Author: Andreas Boll andreas.boll@gmail.com Date: Fri Jun 8 19:55:51 2012 +0200 glcpp: .gitignore cleanup *.o, *.lo and *~ are already in toplevel .gitignore Reviewed-by: Kenneth Graunke kenn...@whitecape.org --- src/glsl/glcpp/.gitignore |3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/glsl/glcpp/.gitignore b/src/glsl/glcpp/.gitignore index 41b34bb..24a7119 100644 --- a/src/glsl/glcpp/.gitignore +++ b/src/glsl/glcpp/.gitignore @@ -3,7 +3,4 @@ glcpp-lex.c glcpp-parse.output glcpp-parse.c glcpp-parse.h -*.o -*.lo -*~ tests/*.out ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glsl: fix deref_hash memory leak in constant_expression_value
Module: Mesa
Branch: master
Commit: ea055e19c2757dfe97dd13c1deee2bfa177eae3f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea055e19c2757dfe97dd13c1deee2bfa177eae3f
Author: Marcin Slusarz marcin.slus...@gmail.com
Date: Tue Jun 5 21:10:33 2012 +0200
glsl: fix deref_hash memory leak in constant_expression_value
Reviewed-by: Kenneth Graunke kenn...@whitecape.org
---
src/glsl/ir_constant_expression.cpp |7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/glsl/ir_constant_expression.cpp
b/src/glsl/ir_constant_expression.cpp
index 7a4d15f..38a1ed9 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -1322,8 +1322,11 @@
ir_function_signature::constant_expression_value(exec_list *actual_parameters, s
foreach_list(n, actual_parameters) {
ir_constant *constant = ((ir_rvalue *)
n)-constant_expression_value(variable_context);
- if (constant == NULL)
-return NULL;
+ if (constant == NULL) {
+ hash_table_dtor(deref_hash);
+ return NULL;
+ }
+
ir_variable *var = (ir_variable *)parameter_info;
hash_table_insert(deref_hash, constant, var);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glsl: Clean up warnings about deleting classes without virtual destructors.
Module: Mesa
Branch: master
Commit: a018747ac8230f0dfb9f5f49a44d78fe97df84a0
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a018747ac8230f0dfb9f5f49a44d78fe97df84a0
Author: Eric Anholt e...@anholt.net
Date: Mon May 14 16:48:47 2012 -0700
glsl: Clean up warnings about deleting classes without virtual destructors.
Reviewed-by: Kenneth Graunke kenn...@whitecape.org
---
src/glsl/ir.h | 10 ++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index 2c47236..a3f9f05 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -89,6 +89,16 @@ class ir_instruction : public exec_node {
public:
enum ir_node_type ir_type;
+ /**
+* GCC 4.7+ and clang warn when deleting an ir_instruction unless
+* there's a virtual destructor present. Because we almost
+* universally use ralloc for our memory management of
+* ir_instructions, the destructor doesn't need to do any work.
+*/
+ virtual ~ir_instruction()
+ {
+ }
+
/** ir_print_visitor helper for debugging. */
void print(void) const;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa: Fix glCopyBuffserSubData typos in error messages and comments.
Module: Mesa
Branch: master
Commit: 306c9f0c5762ad75e340d22b2405ac11e74d3378
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=306c9f0c5762ad75e340d22b2405ac11e74d3378
Author: Kenneth Graunke kenn...@whitecape.org
Date: Fri Jun 8 22:03:50 2012 -0700
mesa: Fix glCopyBuffserSubData typos in error messages and comments.
Signed-off-by: Kenneth Graunke kenn...@whitecape.org
---
src/mesa/main/bufferobj.c | 20 ++--
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 36a7619..5415665 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -546,7 +546,7 @@ _mesa_buffer_unmap( struct gl_context *ctx, struct
gl_buffer_object *bufObj )
/**
* Default fallback for \c dd_function_table::CopyBufferSubData().
- * Called via glCopyBuffserSubData().
+ * Called via glCopyBufferSubData().
*/
static void
_mesa_copy_buffer_subdata(struct gl_context *ctx,
@@ -1328,48 +1328,48 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum
writeTarget,
struct gl_buffer_object *src, *dst;
ASSERT_OUTSIDE_BEGIN_END(ctx);
- src = get_buffer(ctx, glCopyBuffserSubData, readTarget);
+ src = get_buffer(ctx, glCopyBufferSubData, readTarget);
if (!src)
return;
- dst = get_buffer(ctx, glCopyBuffserSubData, writeTarget);
+ dst = get_buffer(ctx, glCopyBufferSubData, writeTarget);
if (!dst)
return;
if (_mesa_bufferobj_mapped(src)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- glCopyBuffserSubData(readBuffer is mapped));
+ glCopyBufferSubData(readBuffer is mapped));
return;
}
if (_mesa_bufferobj_mapped(dst)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- glCopyBuffserSubData(writeBuffer is mapped));
+ glCopyBufferSubData(writeBuffer is mapped));
return;
}
if (readOffset 0) {
_mesa_error(ctx, GL_INVALID_VALUE,
- glCopyBuffserSubData(readOffset = %d), (int) readOffset);
+ glCopyBufferSubData(readOffset = %d), (int) readOffset);
return;
}
if (writeOffset 0) {
_mesa_error(ctx, GL_INVALID_VALUE,
- glCopyBuffserSubData(writeOffset = %d), (int) writeOffset);
+ glCopyBufferSubData(writeOffset = %d), (int) writeOffset);
return;
}
if (readOffset + size src-Size) {
_mesa_error(ctx, GL_INVALID_VALUE,
- glCopyBuffserSubData(readOffset + size = %d),
+ glCopyBufferSubData(readOffset + size = %d),
(int) (readOffset + size));
return;
}
if (writeOffset + size dst-Size) {
_mesa_error(ctx, GL_INVALID_VALUE,
- glCopyBuffserSubData(writeOffset + size = %d),
+ glCopyBufferSubData(writeOffset + size = %d),
(int) (writeOffset + size));
return;
}
@@ -1384,7 +1384,7 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum
writeTarget,
else {
/* overlapping src/dst is illegal */
_mesa_error(ctx, GL_INVALID_VALUE,
- glCopyBuffserSubData(overlapping src/dst));
+ glCopyBufferSubData(overlapping src/dst));
return;
}
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
