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

Unified Diff: cc/throttled_texture_uploader.cc

Issue 11111005: Remove GraphicsContext3D:: stubs from cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again Created 8 years, 2 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 | « cc/threaded_unittest.h ('k') | cc/throttled_texture_uploader_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/throttled_texture_uploader.cc
diff --git a/cc/throttled_texture_uploader.cc b/cc/throttled_texture_uploader.cc
index 3a241b2212ea47f75679e2a1371ae6d83a95ef72..13b39daea0918e881eb557d375772f16e9102487 100644
--- a/cc/throttled_texture_uploader.cc
+++ b/cc/throttled_texture_uploader.cc
@@ -6,9 +6,10 @@
#include "cc/throttled_texture_uploader.h"
#include "CCPrioritizedTexture.h"
-#include "Extensions3DChromium.h"
#include "base/debug/trace_event.h"
#include "base/metrics/histogram.h"
+#include "third_party/khronos/GLES2/gl2.h"
+#include "third_party/khronos/GLES2/gl2ext.h"
#include <algorithm>
#include <public/WebGraphicsContext3D.h>
#include <vector>
@@ -46,18 +47,18 @@ void ThrottledTextureUploader::Query::begin()
{
m_hasValue = false;
m_isNonBlocking = false;
- m_context->beginQueryEXT(Extensions3DChromium::COMMANDS_ISSUED_CHROMIUM, m_queryId);
+ m_context->beginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM, m_queryId);
}
void ThrottledTextureUploader::Query::end()
{
- m_context->endQueryEXT(Extensions3DChromium::COMMANDS_ISSUED_CHROMIUM);
+ m_context->endQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM);
}
bool ThrottledTextureUploader::Query::isPending()
{
unsigned available = 1;
- m_context->getQueryObjectuivEXT(m_queryId, Extensions3DChromium::QUERY_RESULT_AVAILABLE_EXT, &available);
+ m_context->getQueryObjectuivEXT(m_queryId, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
return !available;
}
@@ -70,7 +71,7 @@ void ThrottledTextureUploader::Query::wait()
unsigned ThrottledTextureUploader::Query::value()
{
if (!m_hasValue) {
- m_context->getQueryObjectuivEXT(m_queryId, Extensions3DChromium::QUERY_RESULT_EXT, &m_value);
+ m_context->getQueryObjectuivEXT(m_queryId, GL_QUERY_RESULT_EXT, &m_value);
m_hasValue = true;
}
return m_value;
« no previous file with comments | « cc/threaded_unittest.h ('k') | cc/throttled_texture_uploader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698