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

Side by Side Diff: ui/gfx/gl/gl_bindings_skia_in_process.cc

Issue 7227009: Add chromium_code: 1 to surface.gyp and gl.gyp to pick up -Werror. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: foo Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/gl/gl.gyp ('k') | ui/gfx/gl/gl_context_glx.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 5
6 #include "ui/gfx/gl/gl_bindings_skia_in_process.h" 6 #include "ui/gfx/gl/gl_bindings_skia_in_process.h"
7 7
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "ui/gfx/gl/gl_bindings.h" 9 #include "ui/gfx/gl/gl_bindings.h"
10 #include "ui/gfx/gl/gl_implementation.h" 10 #include "ui/gfx/gl/gl_implementation.h"
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 break; 449 break;
450 case gfx::kGLImplementationOSMesaGL: 450 case gfx::kGLImplementationOSMesaGL:
451 binding = kDesktop_GrGLBinding; 451 binding = kDesktop_GrGLBinding;
452 break; 452 break;
453 case gfx::kGLImplementationEGLGLES2: 453 case gfx::kGLImplementationEGLGLES2:
454 binding = kES2_GrGLBinding; 454 binding = kES2_GrGLBinding;
455 break; 455 break;
456 case gfx::kGLImplementationMockGL: 456 case gfx::kGLImplementationMockGL:
457 NOTREACHED(); 457 NOTREACHED();
458 return; 458 return;
459 default:
460 NOTREACHED();
461 return;
459 } 462 }
460 463
461 static GrGLInterface host_gl_interface = { 464 static GrGLInterface host_gl_interface = {
462 binding, 465 binding,
463 466
464 kProbe_GrGLCapability, // NPOTRenderTargetSupport 467 kProbe_GrGLCapability, // NPOTRenderTargetSupport
465 kProbe_GrGLCapability, // MinRenderTargetHeight 468 kProbe_GrGLCapability, // MinRenderTargetHeight
466 kProbe_GrGLCapability, // MinRenderTargetWidth 469 kProbe_GrGLCapability, // MinRenderTargetWidth
467 470
468 StubGLActiveTexture, 471 StubGLActiveTexture,
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 NULL, // glBindFragDataLocationIndexed 577 NULL, // glBindFragDataLocationIndexed
575 GrGLInterface::kStaticInitEndGuard, 578 GrGLInterface::kStaticInitEndGuard,
576 }; 579 };
577 GrGLSetGLInterface(&host_gl_interface); 580 GrGLSetGLInterface(&host_gl_interface);
578 host_StubGL_installed = true; 581 host_StubGL_installed = true;
579 } 582 }
580 } 583 }
581 584
582 } // namespace gfx 585 } // namespace gfx
583 586
OLDNEW
« no previous file with comments | « ui/gfx/gl/gl.gyp ('k') | ui/gfx/gl/gl_context_glx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698