Index: gpu/command_buffer/common/gles2_cmd_format.h |
diff --git a/gpu/command_buffer/common/gles2_cmd_format.h b/gpu/command_buffer/common/gles2_cmd_format.h |
index c1801f00b9144462cf1cb5a086a9165021a1e10e..f7bf52f28e20062407ad9fcc7c5c67469cbef269 100644 |
--- a/gpu/command_buffer/common/gles2_cmd_format.h |
+++ b/gpu/command_buffer/common/gles2_cmd_format.h |
@@ -60,28 +60,26 @@ static_assert(GPU_COMMAND_BUFFER_ENTRY_ALIGNMENT == 4, |
namespace id_namespaces { |
// These are used when contexts share resources. |
-enum IdNamespaces { |
+enum SharedIdNamespaces { |
kBuffers, |
- kFramebuffers, |
kProgramsAndShaders, |
kRenderbuffers, |
kTextures, |
- kQueries, |
- kVertexArrays, |
kSamplers, |
kTransformFeedbacks, |
Zhenyao Mo
2017/04/19 20:24:28
Transform feedback objects are also not shared.
Chandan
2017/04/20 10:56:07
Sure. I will add necessary changes for this too.
|
kSyncs, |
- kNumIdNamespaces |
+ kNumSharedIdNamespaces |
}; |
+enum IdNamespaces { kFramebuffers, kQueries, kVertexArrays, kNumIdNamespaces }; |
Zhenyao Mo
2017/04/19 20:24:28
Although in general I agree with the spirit of thi
Chandan
2017/04/20 10:56:07
I had to split this to create IdAllocators only fo
Zhenyao Mo
2017/05/09 22:21:54
Per offline discussion with piman, we can use enum
Chandan
2017/05/10 14:47:37
By mapping, you mean converting enums to int using
|
+ |
enum RangeIdNamespaces { kPaths, kNumRangeIdNamespaces }; |
// These numbers must not change |
static_assert(kBuffers == 0, "kBuffers should equal 0"); |
-static_assert(kFramebuffers == 1, "kFramebuffers should equal 1"); |
-static_assert(kProgramsAndShaders == 2, "kProgramsAndShaders should equal 2"); |
-static_assert(kRenderbuffers == 3, "kRenderbuffers should equal 3"); |
-static_assert(kTextures == 4, "kTextures should equal 4"); |
+static_assert(kProgramsAndShaders == 1, "kProgramsAndShaders should equal 1"); |
+static_assert(kRenderbuffers == 2, "kRenderbuffers should equal 2"); |
+static_assert(kTextures == 3, "kTextures should equal 4"); |
Zhenyao Mo
2017/05/09 22:21:54
These need to be updated.
Chandan
2017/05/10 14:47:37
Need to add static_assert for other enum values as
|
static_assert(kPaths == 0, "kPaths should equal 0"); |
} // namespace id_namespaces |