Validate UniformBlocks being backed by sufficient data

gpu/command_buffer/service/program_manager.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 106 matching lines @@
         : size(_size),
           type(_type),
           location(_location),
           name(_name) {
     }
     GLsizei size;
     GLenum type;
     GLint location;
     std::string name;
   };
+  struct UniformBlockSizeInfo {
+    uint32_t binding;
+    uint32_t data_size;
+  };
 
   template <typename T>
   class ShaderVariableLocationEntry {
    public:
     ShaderVariableLocationEntry()
         : shader_variable_(nullptr), inactive_(false) {}
     bool IsUnused() const { return !shader_variable_ && !inactive_; }
     bool IsInactive() const { return inactive_; }
     bool IsActive() const { return shader_variable_ != nullptr; }
     void SetInactive() {
@@ skipping 255 matching lines @@
 
   // See member declaration for details.
   // The data are only valid after a successful link.
   uint32_t fragment_output_type_mask() const {
       return fragment_output_type_mask_;
   }
   uint32_t fragment_output_written_mask() const {
       return fragment_output_written_mask_;
   }
 
+  // Update uniform block binding after a successful glUniformBlockBinding().
+  void SetUniformBlockBinding(GLuint index, GLuint binding);
+
+  const std::vector<UniformBlockSizeInfo>& uniform_block_size_info() const {
+    return uniform_block_size_info_;
+  }
+
  private:
   friend class base::RefCounted<Program>;
   friend class ProgramManager;
 
   ~Program();
 
   void set_log_info(const char* str) {
     log_info_.reset(str ? new std::string(str) : NULL);
   }
 
@@ skipping 17 matching lines @@
 
   // Resets the program.
   void Reset();
 
   // Updates the program info after a successful link.
   void Update();
   void UpdateUniforms();
   void UpdateFragmentInputs();
   void UpdateProgramOutputs();
   void UpdateFragmentOutputBaseTypes();
+  void UpdateUniformBlockSizeInfo();
 
   // Process the program log, replacing the hashed names with original names.
   std::string ProcessLogInfo(const std::string& log);
 
   // Updates the program log info from GL
   void UpdateLogInfo();
 
   // Clears all the uniforms.
   void ClearUniforms(std::vector<uint8_t>* zero_buffer);
 
@@ skipping 86 matching lines @@
   GLenum transform_feedback_buffer_mode_;
 
   // Fragment input-location binding map from
   // glBindFragmentInputLocationCHROMIUM() calls.
   LocationMap bind_fragment_input_location_map_;
 
   // output variable - (location,index) binding map from
   // glBindFragDataLocation() and ..IndexedEXT() calls.
   LocationIndexMap bind_program_output_location_index_map_;
 
+  // It's stored in the order of uniform block indices, i.e., the first
+  // entry is the info about UniformBlock with index 0, etc.
+  std::vector<UniformBlockSizeInfo> uniform_block_size_info_;
+
   // Fragment output variable base types: FLOAT, INT, or UINT.
   // We have up to 16 outputs, each is encoded into 2 bits, total 32 bits:
   // the lowest 2 bits for location 0, the highest 2 bits for location 15.
   uint32_t fragment_output_type_mask_;
   // Same layout as above, 2 bits per location, 0x03 if a location is occupied
   // by an output variable, 0x00 if not.
   uint32_t fragment_output_written_mask_;
 };
 
 // Tracks the Programs.
@@ skipping 90 matching lines @@
 };
 
 inline const FeatureInfo& Program::feature_info() const {
   return *manager_->feature_info_.get();
 }
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_