summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorepenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-03 21:06:04 +0000
committerepenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-03 21:06:04 +0000
commitfeb37588d506ba4ce062a9b0c9d14fd0fc7f62a6 (patch)
treea8cef6b3c1fe1fcd56b0d238a01d561b9208c4b8 /gpu
parentd2c4ad0731cf8d80871e77ea4d63911ca5eda09d (diff)
downloadchromium_src-feb37588d506ba4ce062a9b0c9d14fd0fc7f62a6.zip
chromium_src-feb37588d506ba4ce062a9b0c9d14fd0fc7f62a6.tar.gz
chromium_src-feb37588d506ba4ce062a9b0c9d14fd0fc7f62a6.tar.bz2
CC: Clean up tile size setting.
This is a non-functional cleanup. IMG introduced a memory leak so we switch to idle uploads. The new drivers with the memory leak fixed don't need the other workarounds either, so we can do without the size work-arounds. Without that work-around, we no longer need to know if the driver is IMG, so we can move the tile-size logic to a better place and avoid using the command-line. BUG=365877 Review URL: https://codereview.chromium.org/313403002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/common/capabilities.cc1
-rw-r--r--gpu/command_buffer/common/capabilities.h1
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc2
-rw-r--r--gpu/config/gpu_driver_bug_list_json.cc16
-rw-r--r--gpu/config/gpu_driver_bug_workaround_type.h2
5 files changed, 1 insertions, 21 deletions
diff --git a/gpu/command_buffer/common/capabilities.cc b/gpu/command_buffer/common/capabilities.cc
index 74a9001..f286eaf 100644
--- a/gpu/command_buffer/common/capabilities.cc
+++ b/gpu/command_buffer/common/capabilities.cc
@@ -8,7 +8,6 @@ namespace gpu {
Capabilities::Capabilities()
: post_sub_buffer(false),
- fast_npot_mo8_textures(false),
egl_image_external(false),
texture_format_bgra8888(false),
texture_format_etc1(false),
diff --git a/gpu/command_buffer/common/capabilities.h b/gpu/command_buffer/common/capabilities.h
index c941281..9e38f5c 100644
--- a/gpu/command_buffer/common/capabilities.h
+++ b/gpu/command_buffer/common/capabilities.h
@@ -11,7 +11,6 @@ namespace gpu {
struct GPU_EXPORT Capabilities {
bool post_sub_buffer;
- bool fast_npot_mo8_textures;
bool egl_image_external;
bool texture_format_bgra8888;
bool texture_format_etc1;
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 0c04999..c2b08e7 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2695,8 +2695,6 @@ Capabilities GLES2DecoderImpl::GetCapabilities() {
Capabilities caps;
- caps.fast_npot_mo8_textures =
- feature_info_->workarounds().enable_chromium_fast_npot_mo8_textures;
caps.egl_image_external =
feature_info_->feature_flags().oes_egl_image_external;
caps.texture_format_bgra8888 =
diff --git a/gpu/config/gpu_driver_bug_list_json.cc b/gpu/config/gpu_driver_bug_list_json.cc
index b92ebda..9aa3310 100644
--- a/gpu/config/gpu_driver_bug_list_json.cc
+++ b/gpu/config/gpu_driver_bug_list_json.cc
@@ -19,7 +19,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
{
"name": "gpu driver bug list",
// Please update the version number whenever you change this file.
- "version": "6.3",
+ "version": "6.4",
"entries": [
{
"id": 1,
@@ -251,20 +251,6 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
]
},
{
- "id": 18,
- "description": "Everything except async + NPOT + multiple-of-8 textures are brutally slow for Imagination drivers",
- "os": {
- "type": "android"
- },
- "gl_vendor": {
- "op": "beginwith",
- "value": "Imagination"
- },
- "features": [
- "enable_chromium_fast_npot_mo8_textures"
- ]
- },
- {
"id": 19,
"description": "Disable depth textures on Android with Qualcomm GPUs",
"os": {
diff --git a/gpu/config/gpu_driver_bug_workaround_type.h b/gpu/config/gpu_driver_bug_workaround_type.h
index 5b3c684..c3dd6a0 100644
--- a/gpu/config/gpu_driver_bug_workaround_type.h
+++ b/gpu/config/gpu_driver_bug_workaround_type.h
@@ -42,8 +42,6 @@
disable_oes_standard_derivatives) \
GPU_OP(DISABLE_POST_SUB_BUFFERS_FOR_ONSCREEN_SURFACES, \
disable_post_sub_buffers_for_onscreen_surfaces) \
- GPU_OP(ENABLE_CHROMIUM_FAST_NPOT_MO8_TEXTURES, \
- enable_chromium_fast_npot_mo8_textures) \
GPU_OP(EXIT_ON_CONTEXT_LOST, \
exit_on_context_lost) \
GPU_OP(FORCE_DISCRETE_GPU, \