Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: gpu/GLES2/extensions/CHROMIUM/CHROMIUM_stream_texture_matrix.txt

Issue 2150993002: Revert of Always apply UniformMatrix4fvStreamTextureMatrixCHROMIUM matrix argument. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/shader.cc ('k') | gpu/command_buffer/client/gles2_c_lib_autogen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/GLES2/extensions/CHROMIUM/CHROMIUM_stream_texture_matrix.txt
diff --git a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_stream_texture_matrix.txt b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_stream_texture_matrix.txt
index 1744f89588c7a99898c1c7a79e2ae360c21c1c87..d0bfe8821346030e32919b1269808cefef3338f1 100644
--- a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_stream_texture_matrix.txt
+++ b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_stream_texture_matrix.txt
@@ -30,19 +30,20 @@
void UniformMatrix4fvStreamTextureMatrixCHROMIUM(
GLintUniformLocation location,
GLbooleanFalseOnly transpose,
- const GLfloat* transform)
+ const GLfloat* default_value)
- Updates a uniform to match the current stream texture's texture matrix
- multiplied by transform. The stream texture must be bound to the
- GL_TEXTURE_EXTERNAL_OES target on the active texture unit.
+ Updates a uniform to match the current stream texture's texture matrix.
+ The stream texture must be bound to the GL_TEXTURE_EXTERNAL_OES target on
+ the active texture unit.
- If the bound texture is not a stream texture, then the identity matrix is
+ If the bound texture is not a stream texture, then the default value is
used instead.
<location> Specifies the 4x4f uniform location to be modified.
<transpose> Specifies whether the matrix should be transposed.
- <transform> Provides an additional transform matrix that is applied
- prior to the the stream texture transformation matrix.
+ <default_value> Provides the default matrix.
+
+ The default value is a transitionary step. It will be removed.
Errors
@@ -55,4 +56,3 @@
Revision History
02/16/2016 Documented the extension
- 03/21/2016 Amended the interpretation of the matrix argument.
« no previous file with comments | « cc/output/shader.cc ('k') | gpu/command_buffer/client/gles2_c_lib_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698