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

Side by Side Diff: src/gpu/gl/GrGLSL.h

Issue 133413003: Rename GrGLBinding->GrGLStandard, no longer a bitfield (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: actually fix enum names? Created 6 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef GrGLSL_DEFINED 8 #ifndef GrGLSL_DEFINED
9 #define GrGLSL_DEFINED 9 #define GrGLSL_DEFINED
10 10
(...skipping 22 matching lines...) Expand all
33 k140_GrGLSLGeneration, 33 k140_GrGLSLGeneration,
34 /** 34 /**
35 * Desktop GLSL 1.50 35 * Desktop GLSL 1.50
36 */ 36 */
37 k150_GrGLSLGeneration, 37 k150_GrGLSLGeneration,
38 }; 38 };
39 39
40 /** 40 /**
41 * Gets the most recent GLSL Generation compatible with the OpenGL context. 41 * Gets the most recent GLSL Generation compatible with the OpenGL context.
42 */ 42 */
43 GrGLSLGeneration GrGetGLSLGeneration(GrGLBinding binding, 43 GrGLSLGeneration GrGetGLSLGeneration(const GrGLInterface* gl);
44 const GrGLInterface* gl);
45 44
46 /** 45 /**
47 * Returns a string to include at the beginning of a shader to declare the GLSL 46 * Returns a string to include at the beginning of a shader to declare the GLSL
48 * version. 47 * version.
49 */ 48 */
50 const char* GrGetGLSLVersionDecl(const GrGLContextInfo&); 49 const char* GrGetGLSLVersionDecl(const GrGLContextInfo&);
51 50
52 /** 51 /**
53 * Converts a GrSLType to a string containing the name of the equivalent GLSL ty pe. 52 * Converts a GrSLType to a string containing the name of the equivalent GLSL ty pe.
54 */ 53 */
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 /** 311 /**
313 * Does an inplace mul, *=, of vec4VarName by mulFactor. 312 * Does an inplace mul, *=, of vec4VarName by mulFactor.
314 * A semicolon and newline are added after the assignment. 313 * A semicolon and newline are added after the assignment.
315 */ 314 */
316 void GrGLSLMulVarBy4f(SkString* outAppend, unsigned tabCnt, 315 void GrGLSLMulVarBy4f(SkString* outAppend, unsigned tabCnt,
317 const char* vec4VarName, const GrGLSLExpr4& mulFactor); 316 const char* vec4VarName, const GrGLSLExpr4& mulFactor);
318 317
319 #include "GrGLSL_impl.h" 318 #include "GrGLSL_impl.h"
320 319
321 #endif 320 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698