diff options
| author | epenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 20:57:09 +0000 |
|---|---|---|
| committer | epenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 20:57:09 +0000 |
| commit | 3480a07b35ce4b407a8924aad62dead625ffb725 (patch) | |
| tree | a1d7e62b752fa07cf0db624ccb9c323b0e49040f /gpu | |
| parent | 3da7ac8f632fba6459fa3d19da0767788125942e (diff) | |
| download | chromium_src-3480a07b35ce4b407a8924aad62dead625ffb725.zip chromium_src-3480a07b35ce4b407a8924aad62dead625ffb725.tar.gz chromium_src-3480a07b35ce4b407a8924aad62dead625ffb725.tar.bz2 | |
Revert "gpu: Fix Vivante's "hisilicon" GPUs"
Revert "gpu: Fix uninitialized variable."
Reverting these two CLs so they can be landed behind
#ifdef's (for merge safety).
BUG=179250
NOTRY=true
No try since this is just a revert.
Review URL: https://chromiumcodereview.appspot.com/14241009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/feature_info.cc | 5 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gpu_driver_bug_workaround_type.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index aad133e..d9df6f6 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -191,7 +191,6 @@ void FeatureInfo::AddFeatures(const CommandLine& command_line) { bool is_qualcomm = false; bool is_imagination = false; bool is_arm = false; - bool is_hisilicon = false; const char* gl_strings[2]; gl_strings[0] = reinterpret_cast<const char*>(glGetString(GL_VENDOR)); gl_strings[1] = reinterpret_cast<const char*>(glGetString(GL_RENDERER)); @@ -209,7 +208,6 @@ void FeatureInfo::AddFeatures(const CommandLine& command_line) { is_qualcomm |= string_set.Contains("qualcomm"); is_imagination |= string_set.Contains("imagination"); is_arm |= string_set.Contains("arm"); - is_hisilicon |= string_set.Contains("hisilicon"); } } @@ -223,9 +221,6 @@ void FeatureInfo::AddFeatures(const CommandLine& command_line) { workarounds_.flush_on_context_switch = true; workarounds_.delete_instead_of_resize_fbo = true; } - if (is_hisilicon) { - workarounds_.makecurrent_recreates_surfaces = true; - } #if defined(OS_MACOSX) workarounds_.needs_offscreen_buffer_workaround = is_nvidia; workarounds_.needs_glsl_built_in_function_emulation = is_amd; diff --git a/gpu/command_buffer/service/gpu_driver_bug_workaround_type.h b/gpu/command_buffer/service/gpu_driver_bug_workaround_type.h index fa71504..0478b28 100644 --- a/gpu/command_buffer/service/gpu_driver_bug_workaround_type.h +++ b/gpu/command_buffer/service/gpu_driver_bug_workaround_type.h @@ -28,8 +28,6 @@ exit_on_context_lost) \ GPU_OP(FLUSH_ON_CONTEXT_SWITCH, \ flush_on_context_switch) \ - GPU_OP(MAKECURRENT_RECREATES_SURFACES, \ - makecurrent_recreates_surfaces) \ GPU_OP(MAX_CUBE_MAP_TEXTURE_SIZE_LIMIT_1024, \ max_cube_map_texture_size_limit_1024) \ GPU_OP(MAX_CUBE_MAP_TEXTURE_SIZE_LIMIT_4096, \ |