VRShell: Composing Daydream controller textures from patches

chrome/browser/android/vr_shell/vr_shell_renderer.cc

 // Copyright 2016 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 "chrome/browser/android/vr_shell/vr_shell_renderer.h"
 
 #include <math.h>
 #include <algorithm>
 #include <string>
 
@@ skipping 590 matching lines @@
   glBufferData(GL_ELEMENT_ARRAY_BUFFER, model->IndicesBufferSize(),
                model->IndicesBuffer(), GL_STATIC_DRAW);
 
   glGenBuffersARB(1, &vertex_buffer_);
   glBindBuffer(GL_ARRAY_BUFFER, vertex_buffer_);
   glBufferData(GL_ARRAY_BUFFER, model->ElementsBufferSize(),
                model->ElementsBuffer(), GL_STATIC_DRAW);
 
   glGenTextures(VrControllerModel::STATE_COUNT, texture_handles_.data());
   for (int i = 0; i < VrControllerModel::STATE_COUNT; i++) {
+    sk_sp<SkImage> texture = model->GetTexture(i);
+    SkPixmap pixmap;
+    if (!texture->peekPixels(&pixmap)) {
+      LOG(ERROR) << "Failed to read controller texture pixels";
+      continue;
+    }
     glBindTexture(GL_TEXTURE_2D, texture_handles_[i]);
-    const SkBitmap* bitmap = model->GetTexture(i);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, bitmap->width(), bitmap->height(),
-                 0, GL_RGBA, GL_UNSIGNED_BYTE, bitmap->getPixels());
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pixmap.width(), pixmap.height(), 0,
+                 GL_RGBA, GL_UNSIGNED_BYTE, pixmap.addr());
   }
 
   const gltf::Accessor* accessor = model->PositionAccessor();
   position_components_ = gltf::GetTypeComponents(accessor->type);
   position_type_ = accessor->component_type;
   position_stride_ = accessor->byte_stride;
   position_offset_ = VOID_OFFSET(accessor->byte_offset);
 
   accessor = model->TextureCoordinateAccessor();
   tex_coord_components_ = gltf::GetTypeComponents(accessor->type);
@@ skipping 216 matching lines @@
 GradientGridRenderer* VrShellRenderer::GetGradientGridRenderer() {
   Flush();
   return gradient_grid_renderer_.get();
 }
 
 void VrShellRenderer::Flush() {
   textured_quad_renderer_->Flush();
 }
 
 }  // namespace vr_shell