Remove redundant defines of GR_GL macros.
authorbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Tue, 22 Mar 2011 13:08:48 +0000 (13:08 +0000)
committerbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Tue, 22 Mar 2011 13:08:48 +0000 (13:08 +0000)
Patch submitted by weiwei.li@intel.com

Review URL: http://codereview.appspot.com/4290060/

git-svn-id: http://skia.googlecode.com/svn/trunk@977 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/include/GrGLDefines.h

index 46bd2644609b877e841d8a95510fc14fe2f78a75..7fa822ec100bc39ebc7fcbae567fabdd29a48ded 100644 (file)
 #define GR_GL_TEXTURE_ENV_MODE              0x2200
 #define GR_GL_TEXTURE_1D                    0x0DE0
 #define GR_GL_TEXTURE_2D                    0x0DE1
-#define GR_GL_TEXTURE_WRAP_S                0x2802
-#define GR_GL_TEXTURE_WRAP_T                0x2803
-#define GR_GL_TEXTURE_MAG_FILTER            0x2800
-#define GR_GL_TEXTURE_MIN_FILTER            0x2801
+/*     GL_TEXTURE_WRAP_S */
+/*     GL_TEXTURE_WRAP_T */
+/*     GL_TEXTURE_MAG_FILTER */
+/*     GL_TEXTURE_MIN_FILTER */
 #define GR_GL_TEXTURE_ENV_COLOR             0x2201
 #define GR_GL_TEXTURE_GEN_S                 0x0C60
 #define GR_GL_TEXTURE_GEN_T                 0x0C61
 #define GR_GL_TEXTURE_ALPHA_SIZE            0x805F
 #define GR_GL_TEXTURE_LUMINANCE_SIZE        0x8060
 #define GR_GL_TEXTURE_INTENSITY_SIZE        0x8061
-#define GR_GL_NEAREST_MIPMAP_NEAREST        0x2700
-#define GR_GL_NEAREST_MIPMAP_LINEAR         0x2702
-#define GR_GL_LINEAR_MIPMAP_NEAREST         0x2701
-#define GR_GL_LINEAR_MIPMAP_LINEAR          0x2703
+/*     GL_NEAREST_MIPMAP_NEAREST */
+/*     GL_NEAREST_MIPMAP_LINEAR */
+/*     GL_LINEAR_MIPMAP_NEAREST */
+/*     GL_LINEAR_MIPMAP_LINEAR */
 #define GR_GL_OBJECT_LINEAR                 0x2401
 #define GR_GL_OBJECT_PLANE                  0x2501
 #define GR_GL_EYE_LINEAR                    0x2400
 #define GR_GL_SPHERE_MAP                    0x2402
 #define GR_GL_DECAL                         0x2101
 #define GR_GL_MODULATE                      0x2100
-#define GR_GL_NEAREST                       0x2600
-#define GR_GL_REPEAT                        0x2901
+/*     GL_NEAREST */
+/*     GL_REPEAT */
 #define GR_GL_CLAMP                         0x2900
 #define GR_GL_S                             0x2000
 #define GR_GL_T                             0x2001