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

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

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 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/program_manager.cc ('k') | gpu/command_buffer/service/query_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/program_manager_unittest.cc
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
index 5fcb3dcbb4db4f488c3b9e08ccfd2a7cb09307b1..ff913a5ab4e75d3a7c5885f14caedbd1382a0121 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -2075,7 +2075,7 @@ class ProgramManagerWithCacheTest : public ProgramManagerTestBase {
void SetExpectationsForProgramLink(GLuint service_program_id) {
TestHelper::SetupShaderExpectations(gl_.get(), feature_info_.get(), nullptr,
0, nullptr, 0, service_program_id);
- if (gfx::g_driver_gl.ext.b_GL_ARB_get_program_binary) {
+ if (gl::g_driver_gl.ext.b_GL_ARB_get_program_binary) {
EXPECT_CALL(*gl_.get(),
ProgramParameteri(service_program_id,
PROGRAM_BINARY_RETRIEVABLE_HINT,
@@ -2351,7 +2351,7 @@ TEST_P(ProgramManagerDualSourceBlendingES2Test, UseSecondaryFragCoord) {
SetupProgramForVariables(nullptr, 0, kFragmentVaryings,
arraysize(kFragmentVaryings), &shader_version);
- const gfx::GLVersionInfo& gl_version = feature_info_->gl_version_info();
+ const gl::GLVersionInfo& gl_version = feature_info_->gl_version_info();
if (!gl_version.is_es) {
// The call is expected only for OpenGL. OpenGL ES expects to
// output GLES SL 1.00, which does not bind.
@@ -2378,7 +2378,7 @@ TEST_P(ProgramManagerDualSourceBlendingES2Test, UseSecondaryFragData) {
SetupProgramForVariables(nullptr, 0, kFragmentVaryings,
arraysize(kFragmentVaryings), &shader_version);
- const gfx::GLVersionInfo& gl_version = feature_info_->gl_version_info();
+ const gl::GLVersionInfo& gl_version = feature_info_->gl_version_info();
if (!gl_version.is_es) {
// The call is expected only for OpenGL. OpenGL ES expects to
// output GLES SL 1.00, which does not bind.
« no previous file with comments | « gpu/command_buffer/service/program_manager.cc ('k') | gpu/command_buffer/service/query_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698