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

Side by Side Diff: ui/gl/gl_implementation_win.cc

Issue 720033003: Update to VS2013 Update 4, and Windows SDK 8.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ntddi Created 6 years, 1 month 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
« no previous file with comments | « third_party/usrsctp/usrsctp.gyp ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include <vector> 5 #include <vector>
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/base_paths.h" 8 #include "base/base_paths.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 15 matching lines...) Expand all
26 #include "ui/gl/gl_wgl_api_implementation.h" 26 #include "ui/gl/gl_wgl_api_implementation.h"
27 27
28 #if defined(ENABLE_SWIFTSHADER) 28 #if defined(ENABLE_SWIFTSHADER)
29 #include "software_renderer.h" 29 #include "software_renderer.h"
30 #endif 30 #endif
31 31
32 namespace gfx { 32 namespace gfx {
33 33
34 namespace { 34 namespace {
35 35
36 const wchar_t kD3DCompiler[] = L"D3DCompiler_46.dll"; 36 const wchar_t kD3DCompiler[] = L"D3DCompiler_47.dll";
37 37
38 void GL_BINDING_CALL MarshalClearDepthToClearDepthf(GLclampd depth) { 38 void GL_BINDING_CALL MarshalClearDepthToClearDepthf(GLclampd depth) {
39 glClearDepthf(static_cast<GLclampf>(depth)); 39 glClearDepthf(static_cast<GLclampf>(depth));
40 } 40 }
41 41
42 void GL_BINDING_CALL MarshalDepthRangeToDepthRangef(GLclampd z_near, 42 void GL_BINDING_CALL MarshalDepthRangeToDepthRangef(GLclampd z_near,
43 GLclampd z_far) { 43 GLclampd z_far) {
44 glDepthRangef(static_cast<GLclampf>(z_near), static_cast<GLclampf>(z_far)); 44 glDepthRangef(static_cast<GLclampf>(z_near), static_cast<GLclampf>(z_far));
45 } 45 }
46 46
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 case kGLImplementationDesktopGL: 367 case kGLImplementationDesktopGL:
368 return GetGLWindowSystemBindingInfoWGL(info); 368 return GetGLWindowSystemBindingInfoWGL(info);
369 case kGLImplementationEGLGLES2: 369 case kGLImplementationEGLGLES2:
370 return GetGLWindowSystemBindingInfoEGL(info); 370 return GetGLWindowSystemBindingInfoEGL(info);
371 default: 371 default:
372 return false; 372 return false;
373 } 373 }
374 } 374 }
375 375
376 } // namespace gfx 376 } // namespace gfx
OLDNEW
« no previous file with comments | « third_party/usrsctp/usrsctp.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698