From af10c2274b463289efffecac40a7ccde0c48ff0b Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 15 Mar 2015 08:24:49 -0700 Subject: [PATCH 1/2] remove stray carriage returns --- libraries/gpu/src/gpu/Batch.h | 114 +++++++++++++++++----------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/libraries/gpu/src/gpu/Batch.h b/libraries/gpu/src/gpu/Batch.h index 54a6339ae3..84358b7ae1 100644 --- a/libraries/gpu/src/gpu/Batch.h +++ b/libraries/gpu/src/gpu/Batch.h @@ -25,14 +25,14 @@ #if defined(NSIGHT_FOUND) #include "nvToolsExt.h" - class ProfileRange { - public: - ProfileRange(const char *name) { - nvtxRangePush(name); - } - ~ProfileRange() { - nvtxRangePop(); - } + class ProfileRange { + public: + ProfileRange(const char *name) { + nvtxRangePush(name); + } + ~ProfileRange() { + nvtxRangePop(); + } }; #define PROFILE_RANGE(name) ProfileRange profileRangeThis(name); @@ -114,17 +114,17 @@ public: // For now, instead of calling the raw glCall, use the equivalent call on the batch so the call is beeing recorded // THe implementation of these functions is in GLBackend.cpp - void _glEnable(GLenum cap); - void _glDisable(GLenum cap); - + void _glEnable(GLenum cap); + void _glDisable(GLenum cap); + void _glEnableClientState(GLenum array); void _glDisableClientState(GLenum array); void _glCullFace(GLenum mode); void _glAlphaFunc(GLenum func, GLclampf ref); - void _glDepthFunc(GLenum func); - void _glDepthMask(GLboolean flag); + void _glDepthFunc(GLenum func); + void _glDepthMask(GLboolean flag); void _glDepthRange(GLclampd zNear, GLclampd zFar); void _glBindBuffer(GLenum target, GLuint buffer); @@ -138,14 +138,14 @@ public: void _glUniform1f(GLint location, GLfloat v0); void _glUniform2f(GLint location, GLfloat v0, GLfloat v1); void _glUniform4fv(GLint location, GLsizei count, const GLfloat* value); - void _glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); + void _glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); - void _glDrawArrays(GLenum mode, GLint first, GLsizei count); + void _glDrawArrays(GLenum mode, GLint first, GLsizei count); void _glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices); - - void _glColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); - void _glNormalPointer(GLenum type, GLsizei stride, const void *pointer); - void _glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); + + void _glColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); + void _glNormalPointer(GLenum type, GLsizei stride, const void *pointer); + void _glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); void _glVertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); void _glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer); @@ -175,44 +175,44 @@ public: // TODO: As long as we have gl calls explicitely issued from interface // code, we need to be able to record and batch these calls. THe long // term strategy is to get rid of any GL calls in favor of the HIFI GPU API - COMMAND_glEnable, - COMMAND_glDisable, - - COMMAND_glEnableClientState, - COMMAND_glDisableClientState, - - COMMAND_glCullFace, - COMMAND_glAlphaFunc, - - COMMAND_glDepthFunc, - COMMAND_glDepthMask, - COMMAND_glDepthRange, - - COMMAND_glBindBuffer, - - COMMAND_glBindTexture, - COMMAND_glActiveTexture, - - COMMAND_glDrawBuffers, - - COMMAND_glUseProgram, - COMMAND_glUniform1f, - COMMAND_glUniform2f, - COMMAND_glUniform4fv, - COMMAND_glUniformMatrix4fv, - - COMMAND_glDrawArrays, - COMMAND_glDrawRangeElements, - - COMMAND_glColorPointer, - COMMAND_glNormalPointer, - COMMAND_glTexCoordPointer, - COMMAND_glVertexPointer, - - COMMAND_glVertexAttribPointer, - COMMAND_glEnableVertexAttribArray, - COMMAND_glDisableVertexAttribArray, - + COMMAND_glEnable, + COMMAND_glDisable, + + COMMAND_glEnableClientState, + COMMAND_glDisableClientState, + + COMMAND_glCullFace, + COMMAND_glAlphaFunc, + + COMMAND_glDepthFunc, + COMMAND_glDepthMask, + COMMAND_glDepthRange, + + COMMAND_glBindBuffer, + + COMMAND_glBindTexture, + COMMAND_glActiveTexture, + + COMMAND_glDrawBuffers, + + COMMAND_glUseProgram, + COMMAND_glUniform1f, + COMMAND_glUniform2f, + COMMAND_glUniform4fv, + COMMAND_glUniformMatrix4fv, + + COMMAND_glDrawArrays, + COMMAND_glDrawRangeElements, + + COMMAND_glColorPointer, + COMMAND_glNormalPointer, + COMMAND_glTexCoordPointer, + COMMAND_glVertexPointer, + + COMMAND_glVertexAttribPointer, + COMMAND_glEnableVertexAttribArray, + COMMAND_glDisableVertexAttribArray, + COMMAND_glColor4f, NUM_COMMANDS, From bd85179d8251c77ecd15c61ce3a3de77fb589cf3 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 15 Mar 2015 08:24:59 -0700 Subject: [PATCH 2/2] suppress a compiler warning --- libraries/entities/src/LightEntityItem.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/entities/src/LightEntityItem.cpp b/libraries/entities/src/LightEntityItem.cpp index 62a44c7e21..c7a4ef79d7 100644 --- a/libraries/entities/src/LightEntityItem.cpp +++ b/libraries/entities/src/LightEntityItem.cpp @@ -111,6 +111,8 @@ int LightEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, READ_ENTITY_PROPERTY(PROP_EXPONENT, float, _exponent); READ_ENTITY_PROPERTY(PROP_CUTOFF, float, _cutoff); + + (void) ignoredAttenuation; // suppress compiler warning } else { READ_ENTITY_PROPERTY(PROP_IS_SPOTLIGHT, bool, _isSpotlight); READ_ENTITY_PROPERTY_COLOR(PROP_COLOR, _color);