third_party/gles_book_examples/Common/Source/esShader.c - Issue 525019: Revert 35500 - Added an application framework for demos. Ported hellotriangle...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/gles_book_examples/Common/Source/esShader.c

Issue 525019: Revert 35500 - Added an application framework for demos. Ported hellotriangle... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 12 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/gles_book_examples/Common/Source/Win32/esUtil_win32.c ('k') | third_party/gles_book_examples/Common/Source/esShapes.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/gles_book_examples/Common/Source/esShader.c

===================================================================

--- third_party/gles_book_examples/Common/Source/esShader.c (revision 35503)

+++ third_party/gles_book_examples/Common/Source/esShader.c (working copy)

@@ -40,7 +40,7 @@

/// \param shaderSrc Shader source string

/// \return A new shader object on success, 0 on failure

-GLuint esLoadShader ( GLenum type, const char *shaderSrc )

+GLuint ESUTIL_API esLoadShader ( GLenum type, const char *shaderSrc )

{

GLuint shader;

GLint compiled;

@@ -93,7 +93,7 @@

/// \param fragShaderSrc Fragment shader source code

/// \return A new program object linked with the vertex/fragment shader pair, 0 on failure

-GLuint esLoadProgram ( const char *vertShaderSrc, const char *fragShaderSrc )

+GLuint ESUTIL_API esLoadProgram ( const char *vertShaderSrc, const char *fragShaderSrc )

{

GLuint vertexShader;

GLuint fragmentShader;