Add GLStreamTextureImage

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 1584 matching lines @@
 
   void DoUniformMatrix2fv(
       GLint fake_location, GLsizei count, GLboolean transpose,
       const GLfloat* value);
   void DoUniformMatrix3fv(
       GLint fake_location, GLsizei count, GLboolean transpose,
       const GLfloat* value);
   void DoUniformMatrix4fv(
       GLint fake_location, GLsizei count, GLboolean transpose,
       const GLfloat* value);
+  void DoUniformMatrix4fvWithCustomMatrixCHROMIUM(GLint fake_location,
+                                                  GLsizei count,
+                                                  GLint custom_matrix_id,
+                                                  GLboolean transpose,
+                                                  const GLfloat* value);
   void DoUniformMatrix2x3fv(
       GLint fake_location, GLsizei count, GLboolean transpose,
       const GLfloat* value);
   void DoUniformMatrix2x4fv(
       GLint fake_location, GLsizei count, GLboolean transpose,
       const GLfloat* value);
   void DoUniformMatrix3x2fv(
       GLint fake_location, GLsizei count, GLboolean transpose,
       const GLfloat* value);
   void DoUniformMatrix3x4fv(
@@ skipping 5824 matching lines @@
                                    "glUniformMatrix4fv",
                                    Program::kUniformMatrix4f,
                                    &real_location,
                                    &type,
                                    &count)) {
     return;
   }
   glUniformMatrix4fv(real_location, count, transpose, value);
 }
 
+void GLES2DecoderImpl::DoUniformMatrix4fvWithCustomMatrixCHROMIUM(
+    GLint fake_location,
+    GLsizei count,
+    GLint custom_matrix_id,
+    GLboolean transpose,
+    const GLfloat* default_value) {
+  // We override exactly one 4x4 matrix.  Dropping this parameter doesn't seem
+  // to work with the PUTn autogen.

[piman, 2016/02/16 23:56:33]

Use PUT instead of PUTn, and a static count in the py file - see e.g.
VertexAttrib4fv

[liberato (no reviews please), 2016/02/17 17:50:32]

Done.

+  if (count != 1)
+    return;
+
+  float gl_matrix[16];
+  bool copied_matrix = false;
+
+  if (custom_matrix_id == 12345) {  // TODO(liberato): enum

[piman, 2016/02/16 23:56:33]

When adding the enum, make sure it is added to the validation, and replace this
by a DCHECK.

[liberato (no reviews please), 2016/02/17 17:50:32]

done, and checked that the validation is working.

+    // This refers to the bound external texture on the active unit.
+    TextureUnit& unit = state_.texture_units[state_.active_texture_unit];
+    if (TextureRef* texture_ref = unit.bound_texture_external_oes.get()) {
+      if (gl::GLImage* image = texture_ref->texture()->GetLevelImage(

[piman, 2016/02/16 23:56:33]

I suggest raising errors (GL_INVALID_OPERATION) or provide a default value
(identity?) if there's no bound texture or no image.

[liberato (no reviews please), 2016/02/17 17:50:32]

i was planning on making it identity once StreamTexture starts providing the
matrix also.  until then, this is to allow the gl_renderer to send in the matrix
that it got with the quad via the existing gpu => renderer IPC, so that it works
in that case too.

i plan on updating streamtexture for m51.

[piman, 2016/02/17 21:57:29]

Right, but what I meant is, this is always called (from the client side) with a
texture bound. It doesn't really make sense for this call to try to fallback if
a texture isn't bound (and in the end state, there will be no fallback). So
instead, raise an error.
Same with no image bound.
The only case where you want to fallback today is if GetCustomMatrix returns
false. The other cases are just invalid state from the client side.

[liberato (no reviews please), 2016/02/19 18:39:55]

sorry, forgot to do this earlier.  done.

+              GL_TEXTURE_EXTERNAL_OES, 0)) {
+        copied_matrix = image->GetCustomMatrix(custom_matrix_id, gl_matrix);
+      }
+    }
+  }
+  // If the matrix was unsupported, then supply the default.
+  // TODO(liberato): remove |default_value| and replace with an identity matrix.
+  // It is only present as a transitionary step until StreamTexture supplies
+  // the matrix via GLImage.  Once that happens, GLRenderer can quit sending
+  // in a default.
+  if (!copied_matrix)
+    memcpy(gl_matrix, default_value, sizeof(gl_matrix));
+
+  GLenum type = 0;
+  GLint real_location = -1;
+  if (!PrepForSetUniformByLocation(fake_location, "glUniformMatrix4fv",
+                                   Program::kUniformMatrix4f, &real_location,
+                                   &type, &count)) {
+    return;
+  }
+
+  glUniformMatrix4fv(real_location, count, transpose, gl_matrix);
+}
+
 void GLES2DecoderImpl::DoUniformMatrix2x3fv(
     GLint fake_location, GLsizei count, GLboolean transpose,
     const GLfloat* value) {
   GLenum type = 0;
   GLint real_location = -1;
   if (!PrepForSetUniformByLocation(fake_location,
                                    "glUniformMatrix2x3fv",
                                    Program::kUniformMatrix2x3f,
                                    &real_location,
                                    &type,
@@ skipping 5918 matching lines @@
     if (image->CopyTexImage(dest_target))
       return;
   }
 
   DoCopyTexImageIfNeeded(source_texture, source_target);
 
   // GL_TEXTURE_EXTERNAL_OES texture requires apply a transform matrix
   // before presenting.
   if (source_target == GL_TEXTURE_EXTERNAL_OES) {
     // TODO(hkuang): get the StreamTexture transform matrix in GPU process
-    // instead of using kIdentityMatrix crbug.com/226218.
+    // instead of using kIdentityMatrix crbug.com/226218.  AVDACodecImage does
+    // this correctly, but others (e.g., stream_texture_android.cc) don't.
+    GLfloat transform_matrix[16];
+    bool got_matrix = false;
+    if (gl::GLImage* image =
+            source_texture->GetLevelImage(GL_TEXTURE_EXTERNAL_OES, 0)) {
+      got_matrix = image->GetCustomMatrix(12345 /* TODO(liberato): enum */,
+                                          transform_matrix);
+    }
+    if (!got_matrix)
+      memcpy(transform_matrix, kIdentityMatrix, sizeof(transform_matrix));
     copy_texture_CHROMIUM_->DoCopyTextureWithTransform(
-        this, source_target, source_texture->service_id(),
-        dest_target, dest_texture->service_id(), source_width, source_height,
-        unpack_flip_y == GL_TRUE,
-        unpack_premultiply_alpha == GL_TRUE,
-        unpack_unmultiply_alpha == GL_TRUE,
-        kIdentityMatrix);
+        this, source_target, source_texture->service_id(), dest_target,
+        dest_texture->service_id(), source_width, source_height,
+        unpack_flip_y == GL_TRUE, unpack_premultiply_alpha == GL_TRUE,
+        unpack_unmultiply_alpha == GL_TRUE, transform_matrix);
   } else {
     copy_texture_CHROMIUM_->DoCopyTexture(
         this, source_target, source_texture->service_id(),
         source_internal_format, dest_target, dest_texture->service_id(),
         internal_format, source_width, source_height,
         unpack_flip_y == GL_TRUE,
         unpack_premultiply_alpha == GL_TRUE,
         unpack_unmultiply_alpha == GL_TRUE);
   }
 }
@@ skipping 2249 matching lines @@
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu