Index: gpu/command_buffer/service/disk_cache_proto.proto |
diff --git a/gpu/command_buffer/service/disk_cache_proto.proto b/gpu/command_buffer/service/disk_cache_proto.proto |
index 5a55943fba3afb03a1944e86ae0896efe2a8f4b8..ab3bb57a1b64b359726aa1fe7e032963e6c366e6 100644 |
--- a/gpu/command_buffer/service/disk_cache_proto.proto |
+++ b/gpu/command_buffer/service/disk_cache_proto.proto |
@@ -1,24 +1,41 @@ |
option optimize_for = LITE_RUNTIME; |
-message ShaderInfoProto { |
- optional int32 type = 1; |
- optional int32 size = 2; |
+message ShaderVariableProto { |
+ optional uint32 type = 1; |
+ optional uint32 precision = 2; |
optional string name = 3; |
- optional string key = 4; |
- optional int32 precision = 5; |
- optional int32 static_use = 6; |
+ optional string mapped_name = 4; |
+ optional uint32 array_size = 5; |
+ optional bool static_use = 6; |
+ repeated ShaderVariableProto fields = 7; |
+ optional string struct_name = 8; |
+} |
+ |
+message ShaderAttributeProto { |
+ optional ShaderVariableProto basic = 1; |
+ optional int32 location = 2; |
+} |
+ |
+message ShaderUniformProto { |
+ optional ShaderVariableProto basic = 1; |
+} |
+ |
+message ShaderVaryingProto { |
+ optional ShaderVariableProto basic = 1; |
+ optional int32 interpolation = 2; |
+ optional bool is_invariant = 3; |
} |
message ShaderProto { |
optional bytes sha = 1; |
- repeated ShaderInfoProto attribs = 2; |
- repeated ShaderInfoProto uniforms = 3; |
- repeated ShaderInfoProto varyings = 4; |
+ repeated ShaderAttributeProto attribs = 2; |
+ repeated ShaderUniformProto uniforms = 3; |
+ repeated ShaderVaryingProto varyings = 4; |
} |
message GpuProgramProto { |
optional bytes sha = 1; |
- optional int32 format = 2; |
+ optional uint32 format = 2; |
optional bytes program = 3; |
optional ShaderProto vertex_shader = 4; |