From 90313cc36a6f43a3e9d3818aca536cd6631c222b Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 17 Jan 2014 15:05:38 +0000 Subject: Move GrGLExtensions from GrGLContextInfo to GrGLInterface BUG=skia:2042 R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/140823003 git-svn-id: http://skia.googlecode.com/svn/trunk@13118 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/gpu/gl/GrGLFunctions.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'include/gpu/gl/GrGLFunctions.h') diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h index beb657d30a..b6d68c7ff4 100644 --- a/include/gpu/gl/GrGLFunctions.h +++ b/include/gpu/gl/GrGLFunctions.h @@ -11,12 +11,29 @@ #include "GrGLConfig.h" +//////////////////////////////////////////////////////////////////////////////// + /** - * Declares typedefs for all the GL functions used in GrGLInterface + * Classifies GL contexts by which standard they implement (currently as Desktop + * vs. ES). */ +enum GrGLStandard { + kNone_GrGLStandard, + kGL_GrGLStandard, + kGLES_GrGLStandard, +}; + +// Temporary aliases until Chromium can be updated. +typedef GrGLStandard GrGLBinding; +static const GrGLStandard kES2_GrGLBinding = kGLES_GrGLStandard; +static const GrGLStandard kDesktop_GrGLBinding = kGL_GrGLStandard; /////////////////////////////////////////////////////////////////////////////// +/** + * Declares typedefs for all the GL functions used in GrGLInterface + */ + typedef unsigned int GrGLenum; typedef unsigned char GrGLboolean; typedef unsigned int GrGLbitfield; -- cgit v1.2.3