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

Unified Diff: gpu/command_buffer/client/program_info_manager.h

Issue 921023002: Add glGetActiveUniformsiv to GPU command buffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@uniform
Patch Set: Created 5 years, 10 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
Index: gpu/command_buffer/client/program_info_manager.h
diff --git a/gpu/command_buffer/client/program_info_manager.h b/gpu/command_buffer/client/program_info_manager.h
index d6c574a411d34e6bb3e018025d69548a3d23d26d..6f8a745c0b89d9af2106f1500d148842afad799f 100644
--- a/gpu/command_buffer/client/program_info_manager.h
+++ b/gpu/command_buffer/client/program_info_manager.h
@@ -74,6 +74,10 @@ class GLES2_IMPL_EXPORT ProgramInfoManager {
GLES2Implementation* gl, GLuint program, GLsizei count,
const char* const* names, GLuint* indices);
+ bool GetActiveUniformsiv(
+ GLES2Implementation* gl, GLuint program, GLsizei count,
+ const GLuint* indices, GLenum pname, GLint* params);
+
private:
friend class ProgramInfoManagerTest;
@@ -81,11 +85,14 @@ class GLES2_IMPL_EXPORT ProgramInfoManager {
FRIEND_TEST_ALL_PREFIXES(ProgramInfoManagerTest, UpdateES3UniformBlocks);
FRIEND_TEST_ALL_PREFIXES(ProgramInfoManagerTest,
UpdateES3TransformFeedbackVaryings);
+ FRIEND_TEST_ALL_PREFIXES(ProgramInfoManagerTest,
+ GetActiveUniformsivCached);
enum ProgramInfoType {
kES2,
kES3UniformBlocks,
kES3TransformFeedbackVaryings,
+ kES3Uniformsiv,
kNone,
};
@@ -102,6 +109,16 @@ class GLES2_IMPL_EXPORT ProgramInfoManager {
std::string name;
std::vector<GLint> element_locations;
};
+ struct UniformES3 {
+ UniformES3();
+ ~UniformES3();
+
+ GLint block_index;
+ GLint offset;
+ GLint array_stride;
+ GLint matrix_stride;
+ GLint is_row_major;
+ };
struct VertexAttrib {
VertexAttrib(GLsizei _size, GLenum _type, const std::string& _name,
GLint _location);
@@ -146,6 +163,9 @@ class GLES2_IMPL_EXPORT ProgramInfoManager {
// Gets the index of a uniform by name. Return INVALID_INDEX in failure.
GLuint GetUniformIndex(const std::string& name) const;
+ bool GetUniformsiv(
+ GLsizei count, const GLuint* indices, GLenum pname, GLint* params);
+
GLint GetFragDataLocation(const std::string& name) const;
void CacheFragDataLocation(const std::string& name, GLint loc);
@@ -166,6 +186,9 @@ class GLES2_IMPL_EXPORT ProgramInfoManager {
// Updates the ES3 UniformBlock info after a successful link.
void UpdateES3UniformBlocks(const std::vector<int8>& result);
+ // Updates the ES3 Uniformsiv info after a successful link.
+ void UpdateES3Uniformsiv(const std::vector<int8>& result);
+
// Updates the ES3 TransformFeedbackVaryings info after a successful link.
void UpdateES3TransformFeedbackVaryings(const std::vector<int8>& result);
@@ -203,6 +226,10 @@ class GLES2_IMPL_EXPORT ProgramInfoManager {
// TransformFeedback varyings by index.
std::vector<TransformFeedbackVarying> transform_feedback_varyings_;
+ bool cached_es3_uniformsiv_;
+
+ std::vector<UniformES3> uniforms_es3_;
+
base::hash_map<std::string, GLint> frag_data_locations_;
};
« no previous file with comments | « gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h ('k') | gpu/command_buffer/client/program_info_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698