Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-30 17:43:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove stray carriage returns

Browse source
This commit is contained in:
Seth Alves 2015-03-15 08:24:49 -07:00
parent d6bf0f3bec
commit af10c2274b
1 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
libraries/gpu/src/gpu/Batch.h
View file

@ -25,14 +25,14 @@
#if defined(NSIGHT_FOUND) #if defined(NSIGHT_FOUND)
#include "nvToolsExt.h" #include "nvToolsExt.h"
class ProfileRange { class ProfileRange {
public: public:
ProfileRange(const char *name) { ProfileRange(const char *name) {
nvtxRangePush(name); nvtxRangePush(name);
} }
~ProfileRange() { ~ProfileRange() {
nvtxRangePop(); nvtxRangePop();
} }
}; };
#define PROFILE_RANGE(name) ProfileRange profileRangeThis(name); #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 // 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 // THe implementation of these functions is in GLBackend.cpp
void _glEnable(GLenum cap); void _glEnable(GLenum cap);
void _glDisable(GLenum cap); void _glDisable(GLenum cap);
void _glEnableClientState(GLenum array); void _glEnableClientState(GLenum array);
void _glDisableClientState(GLenum array); void _glDisableClientState(GLenum array);
void _glCullFace(GLenum mode); void _glCullFace(GLenum mode);
void _glAlphaFunc(GLenum func, GLclampf ref); void _glAlphaFunc(GLenum func, GLclampf ref);
void _glDepthFunc(GLenum func); void _glDepthFunc(GLenum func);
void _glDepthMask(GLboolean flag); void _glDepthMask(GLboolean flag);
void _glDepthRange(GLclampd zNear, GLclampd zFar); void _glDepthRange(GLclampd zNear, GLclampd zFar);
void _glBindBuffer(GLenum target, GLuint buffer); void _glBindBuffer(GLenum target, GLuint buffer);
@ -138,14 +138,14 @@ public:
void _glUniform1f(GLint location, GLfloat v0); void _glUniform1f(GLint location, GLfloat v0);
void _glUniform2f(GLint location, GLfloat v0, GLfloat v1); void _glUniform2f(GLint location, GLfloat v0, GLfloat v1);
void _glUniform4fv(GLint location, GLsizei count, const GLfloat* value); 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 _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 _glColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer);
void _glNormalPointer(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 _glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer);
void _glVertexPointer(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); 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 // 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 // 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 // term strategy is to get rid of any GL calls in favor of the HIFI GPU API
COMMAND_glEnable, COMMAND_glEnable,
COMMAND_glDisable, COMMAND_glDisable,
COMMAND_glEnableClientState, COMMAND_glEnableClientState,
COMMAND_glDisableClientState, COMMAND_glDisableClientState,
COMMAND_glCullFace, COMMAND_glCullFace,
COMMAND_glAlphaFunc, COMMAND_glAlphaFunc,
COMMAND_glDepthFunc, COMMAND_glDepthFunc,
COMMAND_glDepthMask, COMMAND_glDepthMask,
COMMAND_glDepthRange, COMMAND_glDepthRange,
COMMAND_glBindBuffer, COMMAND_glBindBuffer,
COMMAND_glBindTexture, COMMAND_glBindTexture,
COMMAND_glActiveTexture, COMMAND_glActiveTexture,
COMMAND_glDrawBuffers, COMMAND_glDrawBuffers,
COMMAND_glUseProgram, COMMAND_glUseProgram,
COMMAND_glUniform1f, COMMAND_glUniform1f,
COMMAND_glUniform2f, COMMAND_glUniform2f,
COMMAND_glUniform4fv, COMMAND_glUniform4fv,
COMMAND_glUniformMatrix4fv, COMMAND_glUniformMatrix4fv,
COMMAND_glDrawArrays, COMMAND_glDrawArrays,
COMMAND_glDrawRangeElements, COMMAND_glDrawRangeElements,
COMMAND_glColorPointer, COMMAND_glColorPointer,
COMMAND_glNormalPointer, COMMAND_glNormalPointer,
COMMAND_glTexCoordPointer, COMMAND_glTexCoordPointer,
COMMAND_glVertexPointer, COMMAND_glVertexPointer,
COMMAND_glVertexAttribPointer, COMMAND_glVertexAttribPointer,
COMMAND_glEnableVertexAttribArray, COMMAND_glEnableVertexAttribArray,
COMMAND_glDisableVertexAttribArray, COMMAND_glDisableVertexAttribArray,
COMMAND_glColor4f, COMMAND_glColor4f,
NUM_COMMANDS, NUM_COMMANDS,