Skip to content

Commit

Permalink
Revert 174687
Browse files Browse the repository at this point in the history
> Extract Chromium-specific parts out of third_party/khronos/GLES2 .
> 
> BUG=161389
> 
> Review URL: https://codereview.chromium.org/11679005

TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/11676011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174695 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
kmadhusu@chromium.org committed Dec 27, 2012
1 parent a031c97 commit 4ecea1a
Show file tree
Hide file tree
Showing 5 changed files with 385 additions and 751 deletions.
8 changes: 2 additions & 6 deletions gpu/GLES2/gl2chromium.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@
// gpu/command_buffer/build_gles2_cmd_buffer.py
// DO NOT EDIT!

// This file contains Chromium-specific GLES2 declarations.
// Because we are using both the real system GL and our own.
// emulated GL we need to use different names to avoid conflicts.

#ifndef GPU_GLES2_GL2CHROMIUM_H_
#define GPU_GLES2_GL2CHROMIUM_H_

#include <GLES2/gl2platform.h>
#define GL_CONTEXT_LOST 0x300E

// Because we are using both the real system GL and our own
// emulated GL we need to use different names to avoid conflicts.
#if defined(GLES2_USE_CPP_BINDINGS)
#define GLES2_GET_FUN(name) gles2::GetGLContext()->name
#else
Expand Down
Loading

0 comments on commit 4ecea1a

Please sign in to comment.