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

Unified Diff: gpu/command_buffer/service/context_group.cc

Issue 1325433003: command_buffer: Add support for creating non-WebGL ES 3 contexts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missing hunk Created 5 years, 3 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
« no previous file with comments | « gpu/command_buffer/service/context_group.h ('k') | gpu/command_buffer/service/context_group_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/context_group.cc
diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc
index 24a54b13e2aa8c7b4ca20ff3658c25360fe37f04..e5b4974a8f413573f6cad86219ee05520faacabe 100644
--- a/gpu/command_buffer/service/context_group.cc
+++ b/gpu/command_buffer/service/context_group.cc
@@ -36,7 +36,7 @@ ContextGroup::ContextGroup(
const scoped_refptr<SubscriptionRefSet>& subscription_ref_set,
const scoped_refptr<ValueStateMap>& pending_valuebuffer_state,
bool bind_generates_resource)
- : context_type_(CONTEXT_TYPE_UNDEFINED),
+ : context_type_(CONTEXT_TYPE_OPENGLES2),
mailbox_manager_(mailbox_manager),
memory_tracker_(memory_tracker),
shader_translator_cache_(shader_translator_cache),
@@ -89,31 +89,10 @@ static void GetIntegerv(GLenum pname, uint32* var) {
*var = value;
}
-// static
-ContextGroup::ContextType ContextGroup::GetContextType(
- unsigned webgl_version) {
- switch (webgl_version) {
- case 0:
- return CONTEXT_TYPE_OTHER;
- case 1:
- return CONTEXT_TYPE_WEBGL1;
- case 2:
- return CONTEXT_TYPE_WEBGL2;
- default:
- return CONTEXT_TYPE_UNDEFINED;
- }
-}
-
-bool ContextGroup::Initialize(
- GLES2Decoder* decoder,
- ContextGroup::ContextType context_type,
- const DisallowedFeatures& disallowed_features) {
- if (context_type == CONTEXT_TYPE_UNDEFINED) {
- LOG(ERROR) << "ContextGroup::Initialize failed because of unknown "
- << "context type.";
- return false;
- }
- if (context_type_ == CONTEXT_TYPE_UNDEFINED) {
+bool ContextGroup::Initialize(GLES2Decoder* decoder,
+ ContextType context_type,
+ const DisallowedFeatures& disallowed_features) {
+ if (!HaveContexts()) {
context_type_ = context_type;
} else if (context_type_ != context_type) {
LOG(ERROR) << "ContextGroup::Initialize failed because the type of "
« no previous file with comments | « gpu/command_buffer/service/context_group.h ('k') | gpu/command_buffer/service/context_group_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698