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

Unified Diff: gpu/command_buffer/service/program_manager.h

Issue 2148723004: WebGL 2: make sure VertexAttrib type match the corresponding attrib type in shader (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix the bug in Windows gpu bot 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
Index: gpu/command_buffer/service/program_manager.h
diff --git a/gpu/command_buffer/service/program_manager.h b/gpu/command_buffer/service/program_manager.h
index 8b9d62f150ff3d3c9c6c6b7723a3504af4dffb28..b7a89dbfd2d8a795046f5738ad659c3a8b048870 100644
--- a/gpu/command_buffer/service/program_manager.h
+++ b/gpu/command_buffer/service/program_manager.h
@@ -403,6 +403,14 @@ class GPU_EXPORT Program : public base::RefCounted<Program> {
return fragment_output_written_mask_;
}
+ // The data are only valid after a successful link.
+ uint32_t vertex_input_type_mask() const {
+ return vertex_input_type_mask_;
+ }
+ uint32_t vertex_input_written_mask() const {
+ return vertex_input_written_mask_;
+ }
+
// Update uniform block binding after a successful glUniformBlockBinding().
void SetUniformBlockBinding(GLuint index, GLuint binding);
@@ -447,6 +455,7 @@ class GPU_EXPORT Program : public base::RefCounted<Program> {
void UpdateFragmentInputs();
void UpdateProgramOutputs();
void UpdateFragmentOutputBaseTypes();
+ void UpdateVertexInputBaseTypes();
void UpdateUniformBlockSizeInfo();
// Process the program log, replacing the hashed names with original names.
@@ -565,6 +574,13 @@ class GPU_EXPORT Program : public base::RefCounted<Program> {
// 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_;
+
+ // Vertex input variable base types: FLOAT, INT, or UINT.
+ // We have up to 16 inputs, each is encoded into 2 bits, total 32 bits
+ uint32_t vertex_input_type_mask_;
+ // Same layout as above, 2 bits per location, 0x03 if a location is occupied
+ // by an input variable, 0x00 if not.
+ uint32_t vertex_input_written_mask_;
};
// Tracks the Programs.

Powered by Google App Engine
This is Rietveld 408576698