OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
191ff86
)
mesa: skip FLUSH_VERTICES() if no samplers were changed
author
Timothy Arceri
<tarceri@itsqueeze.com>
Thu, 22 Jun 2017 22:56:40 +0000
(08:56 +1000)
committer
Timothy Arceri
<tarceri@itsqueeze.com>
Mon, 26 Jun 2017 23:20:29 +0000
(09:20 +1000)
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/mesa/main/uniform_query.cpp
patch
|
blob
|
history
diff --git
a/src/mesa/main/uniform_query.cpp
b/src/mesa/main/uniform_query.cpp
index
afb9f56
..
928d3ce
100644
(file)
--- a/
src/mesa/main/uniform_query.cpp
+++ b/
src/mesa/main/uniform_query.cpp
@@
-1079,7
+1079,12
@@
_mesa_uniform(GLint location, GLsizei count, const GLvoid *values,
count = MIN2(count, (int) (uni->array_elements - offset));
}
- _mesa_flush_vertices_for_uniforms(ctx, uni);
+ /* We check samplers for changes and flush if needed in the sampler
+ * handling code further down, so just skip them here.
+ */
+ if (!uni->type->is_sampler()) {
+ _mesa_flush_vertices_for_uniforms(ctx, uni);
+ }
/* Store the data in the "actual type" backing storage for the uniform.
*/