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

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

Issue 1013463003: Update from https://crrev.com/320931 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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
Index: gpu/command_buffer/service/query_manager.cc
diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc
index c0808c47db7e88be92abf4f9baa2408e25c934f3..c74a65000c30408a5ca0695560d864e24d0d5d1c 100644
--- a/gpu/command_buffer/service/query_manager.cc
+++ b/gpu/command_buffer/service/query_manager.cc
@@ -171,13 +171,13 @@ bool AllSamplesPassedQuery::End(base::subtle::Atomic32 submit_count) {
bool AllSamplesPassedQuery::Process(bool did_finish) {
GLuint available = 0;
- glGetQueryObjectuivARB(
+ glGetQueryObjectuiv(
service_id_, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
if (!available) {
return true;
}
GLuint result = 0;
- glGetQueryObjectuivARB(
+ glGetQueryObjectuiv(
service_id_, GL_QUERY_RESULT_EXT, &result);
return MarkAsCompleted(result != 0);
@@ -185,7 +185,7 @@ bool AllSamplesPassedQuery::Process(bool did_finish) {
void AllSamplesPassedQuery::Destroy(bool have_context) {
if (have_context && !IsDeleted()) {
- glDeleteQueriesARB(1, &service_id_);
+ glDeleteQueries(1, &service_id_);
MarkAsDeleted();
}
}
@@ -508,7 +508,7 @@ QueryManager::Query* QueryManager::CreateQuery(
break;
default: {
GLuint service_id = 0;
- glGenQueriesARB(1, &service_id);
+ glGenQueries(1, &service_id);
DCHECK_NE(0u, service_id);
query = new AllSamplesPassedQuery(
this, target, shm_id, shm_offset, service_id);
@@ -582,12 +582,12 @@ GLenum QueryManager::AdjustTargetForEmulation(GLenum target) {
void QueryManager::BeginQueryHelper(GLenum target, GLuint id) {
target = AdjustTargetForEmulation(target);
- glBeginQueryARB(target, id);
+ glBeginQuery(target, id);
}
void QueryManager::EndQueryHelper(GLenum target) {
target = AdjustTargetForEmulation(target);
- glEndQueryARB(target);
+ glEndQuery(target);
}
QueryManager::Query::Query(
« no previous file with comments | « gpu/command_buffer/service/program_manager_unittest.cc ('k') | gpu/command_buffer/service/query_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698