third_party/gles_book_examples/Common/Source/esShapes.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/esShapes.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/esShader.c ('k') | third_party/gles_book_examples/Common/Source/esTransform.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

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

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

@@ -19,7 +19,6 @@

#include "esUtil.h"

#include <stdlib.h>

#include <math.h>

-#include <string.h>

///

// Defines

@@ -51,8 +50,8 @@

/// \return The number of indices required for rendering the buffers (the number of indices stored in the indices array

/// if it is not NULL ) as a GL_TRIANGLE_STRIP

-int esGenSphere ( int numSlices, float radius, GLfloat **vertices, GLfloat **normals,

- GLfloat **texCoords, GLuint **indices )

+int ESUTIL_API esGenSphere ( int numSlices, float radius, GLfloat **vertices, GLfloat **normals,

+ GLfloat **texCoords, GLuint **indices )

{

int i;

int j;

@@ -138,8 +137,8 @@

/// \return The number of indices required for rendering the buffers (the number of indices stored in the indices array

/// if it is not NULL ) as a GL_TRIANGLE_STRIP

-int esGenCube ( float scale, GLfloat **vertices, GLfloat **normals,

- GLfloat **texCoords, GLuint **indices )

+int ESUTIL_API esGenCube ( float scale, GLfloat **vertices, GLfloat **normals,

+ GLfloat **texCoords, GLuint **indices )

{

int i;

int numVertices = 24;