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

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

Issue 254083002: Fail to create GrContext when we get a NULL for a GL/GLSL version string (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: check GrGLCaps::init return Created 6 years, 7 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
« no previous file with comments | « src/gpu/gl/GrGLInterface.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 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(const GrGLInterface* gl); 43 bool GrGetGLSLGeneration(const GrGLInterface* gl, GrGLSLGeneration* generation);
44 44
45 /** 45 /**
46 * 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
47 * version. 47 * version.
48 */ 48 */
49 const char* GrGetGLSLVersionDecl(const GrGLContextInfo&); 49 const char* GrGetGLSLVersionDecl(const GrGLContextInfo&);
50 50
51 /** 51 /**
52 * 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.
53 */ 53 */
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 /** 311 /**
312 * Does an inplace mul, *=, of vec4VarName by mulFactor. 312 * Does an inplace mul, *=, of vec4VarName by mulFactor.
313 * A semicolon and newline are added after the assignment. 313 * A semicolon and newline are added after the assignment.
314 */ 314 */
315 void GrGLSLMulVarBy4f(SkString* outAppend, unsigned tabCnt, 315 void GrGLSLMulVarBy4f(SkString* outAppend, unsigned tabCnt,
316 const char* vec4VarName, const GrGLSLExpr4& mulFactor); 316 const char* vec4VarName, const GrGLSLExpr4& mulFactor);
317 317
318 #include "GrGLSL_impl.h" 318 #include "GrGLSL_impl.h"
319 319
320 #endif 320 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLInterface.cpp ('k') | src/gpu/gl/GrGLSL.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698