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

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

Issue 659443007: Support GLSL es 3.00 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: nvpr fix Created 6 years, 2 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
« no previous file with comments | « src/gpu/gl/GrGLContext.cpp ('k') | src/gpu/gl/GrGLSL.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 17 matching lines...) Expand all
28 */ 28 */
29 k130_GrGLSLGeneration, 29 k130_GrGLSLGeneration,
30 /** 30 /**
31 * Desktop GLSL 1.40 31 * Desktop GLSL 1.40
32 */ 32 */
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 /**
39 * Desktop GLSL 3.30, and ES GLSL 3.00
40 */
41 k330_GrGLSLGeneration,
42 /**
43 * ES GLSL 3.10 only TODO Make GLSLCap objects to make this more granular
44 */
45 k310es_GrGLSLGeneration,
38 }; 46 };
39 47
40 /** 48 /**
41 * Gets the most recent GLSL Generation compatible with the OpenGL context. 49 * Gets the most recent GLSL Generation compatible with the OpenGL context.
42 */ 50 */
43 bool GrGetGLSLGeneration(const GrGLInterface* gl, GrGLSLGeneration* generation); 51 bool GrGetGLSLGeneration(const GrGLInterface* gl, GrGLSLGeneration* generation);
44 52
45 /** 53 /**
46 * Returns a string to include at the beginning of a shader to declare the GLSL 54 * Returns a string to include at the beginning of a shader to declare the GLSL
47 * version. 55 * version.
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 318
311 /** 319 /**
312 * Does an inplace mul, *=, of vec4VarName by mulFactor. 320 * Does an inplace mul, *=, of vec4VarName by mulFactor.
313 * A semicolon is added after the assignment. 321 * A semicolon is added after the assignment.
314 */ 322 */
315 void GrGLSLMulVarBy4f(SkString* outAppend, const char* vec4VarName, const GrGLSL Expr4& mulFactor); 323 void GrGLSLMulVarBy4f(SkString* outAppend, const char* vec4VarName, const GrGLSL Expr4& mulFactor);
316 324
317 #include "GrGLSL_impl.h" 325 #include "GrGLSL_impl.h"
318 326
319 #endif 327 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLContext.cpp ('k') | src/gpu/gl/GrGLSL.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698