diff --git a/deps/vitaGL/source/custom_shaders.c b/deps/vitaGL/source/custom_shaders.c index bbe2b8de06..f199a70c20 100644 --- a/deps/vitaGL/source/custom_shaders.c +++ b/deps/vitaGL/source/custom_shaders.c @@ -145,7 +145,7 @@ GLuint glCreateShader(GLenum shaderType) { shaders[res - 1].type = GL_VERTEX_SHADER; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } shaders[res - 1].valid = GL_TRUE; @@ -194,7 +194,7 @@ void glAttachShader(GLuint prog, GLuint shad) { break; } } else - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; } GLuint glCreateProgram(void) { @@ -402,7 +402,7 @@ void vglBindPackedAttribLocation(GLuint prog, GLuint index, const GLchar *name, bpe = sizeof(uint8_t); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } @@ -425,7 +425,7 @@ void vglVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean nor #ifndef SKIP_ERROR_HANDLING // Error handling if (stride < 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -440,7 +440,7 @@ void vglVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean nor bpe = sizeof(GLshort); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } diff --git a/deps/vitaGL/source/framebuffers.c b/deps/vitaGL/source/framebuffers.c index c4443277f8..bf6258b60e 100644 --- a/deps/vitaGL/source/framebuffers.c +++ b/deps/vitaGL/source/framebuffers.c @@ -50,7 +50,7 @@ uint32_t get_color_from_texture(uint32_t type) { res = SCE_GXM_COLOR_FORMAT_U8_A; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } return res; @@ -66,7 +66,7 @@ void glGenFramebuffers(GLsizei n, GLuint *ids) { int i = 0, j = 0; #ifndef SKIP_ERROR_HANDLING if (n < 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -85,7 +85,7 @@ void glGenFramebuffers(GLsizei n, GLuint *ids) { void glDeleteFramebuffers(GLsizei n, GLuint *framebuffers) { #ifndef SKIP_ERROR_HANDLING if (n < 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -117,7 +117,7 @@ void glBindFramebuffer(GLenum target, GLuint fb) { active_write_fb = active_read_fb = (framebuffer *)fb; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -134,7 +134,7 @@ void glFramebufferTexture(GLenum target, GLenum attachment, GLuint tex_id, GLint fb = active_read_fb; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } @@ -178,7 +178,7 @@ void glFramebufferTexture(GLenum target, GLenum attachment, GLuint tex_id, GLint sceGxmCreateRenderTarget(&renderTargetParams, &fb->target); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } diff --git a/deps/vitaGL/source/get_info.c b/deps/vitaGL/source/get_info.c index 19459f6985..314d0aa5aa 100644 --- a/deps/vitaGL/source/get_info.c +++ b/deps/vitaGL/source/get_info.c @@ -50,7 +50,7 @@ const GLubyte *glGetString(GLenum name) { return extensions; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; return NULL; break; } @@ -80,7 +80,7 @@ void glGetBooleanv(GLenum pname, GLboolean *params) { *params = GL_FALSE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -123,7 +123,7 @@ void glGetFloatv(GLenum pname, GLfloat *data) { *data = GENERIC_STACK_DEPTH; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -156,7 +156,7 @@ void glGetIntegerv(GLenum pname, GLint *data) { data[3] = gl_viewport.h; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -189,14 +189,14 @@ GLboolean glIsEnabled(GLenum cap) { ret = pol_offset_point; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } return ret; } GLenum glGetError(void) { - GLenum ret = error; - error = GL_NO_ERROR; + GLenum ret = vgl_error; + vgl_error = GL_NO_ERROR; return ret; } diff --git a/deps/vitaGL/source/gxm.c b/deps/vitaGL/source/gxm.c index 0e1f6eb454..66b58f371d 100644 --- a/deps/vitaGL/source/gxm.c +++ b/deps/vitaGL/source/gxm.c @@ -45,7 +45,7 @@ static void *gxm_stencil_surface_addr; // Stencil surface memblock starting addr static SceGxmDepthStencilSurface gxm_depth_stencil_surface; // Depth/Stencil surfaces setup for sceGxm SceGxmContext *gxm_context; // sceGxm context instance -GLenum error = GL_NO_ERROR; // Error returned by glGetError +GLenum vgl_error = GL_NO_ERROR; // Error returned by glGetError SceGxmShaderPatcher *gxm_shader_patcher; // sceGxmShaderPatcher shader patcher instance matrix4x4 mvp_matrix; // ModelViewProjection Matrix diff --git a/deps/vitaGL/source/legacy.c b/deps/vitaGL/source/legacy.c index 48dbef3d9c..1b14001e1c 100644 --- a/deps/vitaGL/source/legacy.c +++ b/deps/vitaGL/source/legacy.c @@ -87,7 +87,7 @@ void glVertex3f(GLfloat x, GLfloat y, GLfloat z) { #ifndef SKIP_ERROR_HANDLING // Error handling if (phase != MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -118,7 +118,7 @@ void glVertex3fv(const GLfloat *v) { #ifndef SKIP_ERROR_HANDLING // Error handling if (phase != MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -209,7 +209,7 @@ void glTexCoord2fv(GLfloat *f) { #ifndef SKIP_ERROR_HANDLING // Error handling if (phase != MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -232,7 +232,7 @@ void glTexCoord2f(GLfloat s, GLfloat t) { #ifndef SKIP_ERROR_HANDLING // Error handling if (phase != MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -255,7 +255,7 @@ void glTexCoord2i(GLint s, GLint t) { #ifndef SKIP_ERROR_HANDLING // Error handling if (phase != MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -278,7 +278,7 @@ void glArrayElement(GLint i) { #ifndef SKIP_ERROR_HANDLING // Error handling if (i < 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -357,7 +357,7 @@ void glBegin(GLenum mode) { #ifndef SKIP_ERROR_HANDLING // Error handling if (phase == MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -394,7 +394,7 @@ void glBegin(GLenum mode) { np = 4; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } @@ -410,7 +410,7 @@ void glEnd(void) { // Error handling if (phase != MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif diff --git a/deps/vitaGL/source/matrices.c b/deps/vitaGL/source/matrices.c index 0b7b64ce10..26c40226fa 100644 --- a/deps/vitaGL/source/matrices.c +++ b/deps/vitaGL/source/matrices.c @@ -46,7 +46,7 @@ void glMatrixMode(GLenum mode) { matrix = &projection_matrix; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -55,10 +55,10 @@ void glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdou #ifndef SKIP_ERROR_HANDLING // Error handling if (phase == MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } else if ((left == right) || (bottom == top) || (nearVal == farVal)) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -72,10 +72,10 @@ void glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLd #ifndef SKIP_ERROR_HANDLING // Error handling if (phase == MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } else if ((left == right) || (bottom == top) || (nearVal < 0) || (farVal < 0)) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -139,7 +139,7 @@ void glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) { #ifndef SKIP_ERROR_HANDLING // Error handling if (phase == MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -162,7 +162,7 @@ void glPushMatrix(void) { #ifndef SKIP_ERROR_HANDLING // Error handling if (phase == MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -171,7 +171,7 @@ void glPushMatrix(void) { #ifndef SKIP_ERROR_HANDLING // Error handling if (modelview_stack_counter >= MODELVIEW_STACK_DEPTH) { - error = GL_STACK_OVERFLOW; + vgl_error = GL_STACK_OVERFLOW; } else #endif // Copying current matrix into the matrix stack and increasing stack counter @@ -181,7 +181,7 @@ void glPushMatrix(void) { #ifndef SKIP_ERROR_HANDLING // Error handling if (projection_stack_counter >= GENERIC_STACK_DEPTH) { - error = GL_STACK_OVERFLOW; + vgl_error = GL_STACK_OVERFLOW; } else #endif // Copying current matrix into the matrix stack and increasing stack counter @@ -193,7 +193,7 @@ void glPopMatrix(void) { #ifndef SKIP_ERROR_HANDLING // Error handling if (phase == MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -202,7 +202,7 @@ void glPopMatrix(void) { #ifndef SKIP_ERROR_HANDLING // Error handling if (modelview_stack_counter == 0) - error = GL_STACK_UNDERFLOW; + vgl_error = GL_STACK_UNDERFLOW; else #endif // Copying last matrix on stack into current matrix and decreasing stack counter @@ -212,7 +212,7 @@ void glPopMatrix(void) { #ifndef SKIP_ERROR_HANDLING // Error handling if (projection_stack_counter == 0) - error = GL_STACK_UNDERFLOW; + vgl_error = GL_STACK_UNDERFLOW; else #endif // Copying last matrix on stack into current matrix and decreasing stack counter diff --git a/deps/vitaGL/source/misc.c b/deps/vitaGL/source/misc.c index ca9cecdadd..69116f437e 100644 --- a/deps/vitaGL/source/misc.c +++ b/deps/vitaGL/source/misc.c @@ -119,7 +119,7 @@ void glPolygonMode(GLenum face, GLenum mode) { new_mode = SCE_GXM_POLYGON_MODE_TRIANGLE_FILL; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } switch (face) { @@ -140,7 +140,7 @@ void glPolygonMode(GLenum face, GLenum mode) { sceGxmSetBackPolygonMode(gxm_context, new_mode); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; return; } update_polygon_offset(); @@ -167,7 +167,7 @@ void glFrontFace(GLenum mode) { void glViewport(GLint x, GLint y, GLsizei width, GLsizei height) { #ifndef SKIP_ERROR_HANDLING if ((width < 0) || (height < 0)) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -197,7 +197,7 @@ void glDepthRangef(GLfloat nearVal, GLfloat farVal) { void glEnable(GLenum cap) { #ifndef SKIP_ERROR_HANDLING if (phase == MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -250,7 +250,7 @@ void glEnable(GLenum cap) { clip_plane0 = GL_TRUE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -258,7 +258,7 @@ void glEnable(GLenum cap) { void glDisable(GLenum cap) { #ifndef SKIP_ERROR_HANDLING if (phase == MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -311,7 +311,7 @@ void glDisable(GLenum cap) { clip_plane0 = GL_FALSE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -411,7 +411,7 @@ void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format } break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; @@ -429,12 +429,12 @@ void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format } break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -443,7 +443,7 @@ void glLineWidth(GLfloat width) { #ifndef SKIP_ERROR_HANDLING // Error handling if (width <= 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -457,7 +457,7 @@ void glPointSize(GLfloat size) { #ifndef SKIP_ERROR_HANDLING // Error handling if (size <= 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -483,7 +483,7 @@ void glFogf(GLenum pname, GLfloat param) { fog_far = param; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -507,7 +507,7 @@ void glFogfv(GLenum pname, const GLfloat *params) { memcpy(&fog_color.r, params, sizeof(vector4f)); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -528,7 +528,7 @@ void glFogi(GLenum pname, const GLint param) { fog_far = param; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -548,7 +548,7 @@ void glClipPlane(GLenum plane, const GLdouble *equation) { memcpy(&clip_plane0_eq.x, &temp.x, sizeof(vector4f)); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } diff --git a/deps/vitaGL/source/shared.h b/deps/vitaGL/source/shared.h index 044dcfe7e9..6be0eb7723 100644 --- a/deps/vitaGL/source/shared.h +++ b/deps/vitaGL/source/shared.h @@ -124,7 +124,7 @@ extern float fullscreen_y_scale; extern float fullscreen_z_scale; extern SceGxmContext *gxm_context; // sceGxm context instance -extern GLenum error; // Error returned by glGetError +extern GLenum vgl_error; // Error returned by glGetError extern SceGxmShaderPatcher *gxm_shader_patcher; // sceGxmShaderPatcher shader patcher instance matrix4x4 mvp_matrix; // ModelViewProjection Matrix diff --git a/deps/vitaGL/source/tests.c b/deps/vitaGL/source/tests.c index e04c4b9f5a..cce5dd5800 100644 --- a/deps/vitaGL/source/tests.c +++ b/deps/vitaGL/source/tests.c @@ -327,7 +327,7 @@ void glScissor(GLint x, GLint y, GLsizei width, GLsizei height) { #ifndef SKIP_ERROR_HANDLING // Error handling if ((width < 0) || (height < 0)) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -385,7 +385,7 @@ void glDepthMask(GLboolean flag) { #ifndef SKIP_ERROR_HANDLING // Error handling if (phase == MODEL_CREATION) { - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; return; } #endif @@ -407,36 +407,36 @@ void glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass switch (face) { case GL_FRONT: if (!change_stencil_config(&stencil_fail_front, sfail)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; if (!change_stencil_config(&depth_fail_front, dpfail)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; if (!change_stencil_config(&depth_pass_front, dppass)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; case GL_BACK: if (!change_stencil_config(&stencil_fail_back, sfail)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; if (!change_stencil_config(&depth_fail_back, dpfail)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; if (!change_stencil_config(&depth_pass_front, dppass)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; case GL_FRONT_AND_BACK: if (!change_stencil_config(&stencil_fail_front, sfail)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; if (!change_stencil_config(&stencil_fail_back, sfail)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; if (!change_stencil_config(&depth_fail_front, dpfail)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; if (!change_stencil_config(&depth_fail_back, dpfail)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; if (!change_stencil_config(&depth_pass_front, dppass)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; if (!change_stencil_config(&depth_pass_back, dppass)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } change_stencil_settings(); @@ -451,26 +451,26 @@ void glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask) { switch (face) { case GL_FRONT: if (!change_stencil_func_config(&stencil_func_front, func)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; stencil_mask_front = mask; stencil_ref_front = ref; break; case GL_BACK: if (!change_stencil_func_config(&stencil_func_back, func)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; stencil_mask_back = mask; stencil_ref_back = ref; break; case GL_FRONT_AND_BACK: if (!change_stencil_func_config(&stencil_func_front, func)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; if (!change_stencil_func_config(&stencil_func_back, func)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; stencil_mask_front = stencil_mask_back = mask; stencil_ref_front = stencil_ref_back = ref; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } change_stencil_settings(); @@ -493,7 +493,7 @@ void glStencilMaskSeparate(GLenum face, GLuint mask) { stencil_mask_front_write = stencil_mask_back_write = mask; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; return; } change_stencil_settings(); diff --git a/deps/vitaGL/source/textures.c b/deps/vitaGL/source/textures.c index a16d58cfec..8d7295926c 100644 --- a/deps/vitaGL/source/textures.c +++ b/deps/vitaGL/source/textures.c @@ -37,7 +37,7 @@ void glGenTextures(GLsizei n, GLuint *res) { #ifndef SKIP_ERROR_HANDLING // Error handling if (n < 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -67,7 +67,7 @@ void glBindTexture(GLenum target, GLuint texture) { tex_unit->tex_id = texture; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -76,7 +76,7 @@ void glDeleteTextures(GLsizei n, const GLuint *gl_textures) { #ifndef SKIP_ERROR_HANDLING // Error handling if (n < 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -138,7 +138,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt data_bpp = 1; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; @@ -150,7 +150,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt data_bpp = 2; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; @@ -162,7 +162,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt else read_cb = readRGB; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; @@ -178,7 +178,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt read_cb = readRGBA5551; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; @@ -225,13 +225,13 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt tex_format = SCE_GXM_TEXTURE_FORMAT_P8_ABGR; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } // Checking if texture is too big for sceGxm if (width > GXM_TEX_MAX_SIZE || height > GXM_TEX_MAX_SIZE) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } @@ -258,7 +258,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -281,10 +281,10 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G int i, j; if (xoffset + width > orig_w) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } else if (yoffset + height > orig_h) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } @@ -323,7 +323,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G data_bpp = 1; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; return; break; } @@ -335,7 +335,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G data_bpp = 2; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; return; break; } @@ -347,7 +347,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G read_cb = readRGB; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; return; break; } @@ -363,7 +363,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G read_cb = readRGBA5551; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; return; break; } @@ -410,7 +410,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -431,12 +431,12 @@ void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum fo bpp = 4; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } @@ -470,7 +470,7 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param) { case GL_LINEAR_MIPMAP_LINEAR: // TODO: Implement this break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } sceGxmTextureSetMinFilter(&tex->gxm_tex, tex_unit->min_filter); @@ -492,7 +492,7 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param) { case GL_LINEAR_MIPMAP_LINEAR: // TODO: Implement this break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } sceGxmTextureSetMagFilter(&tex->gxm_tex, tex_unit->mag_filter); @@ -512,7 +512,7 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param) { tex_unit->u_mode = SCE_GXM_TEXTURE_ADDR_MIRROR_CLAMP; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } sceGxmTextureSetUAddrMode(&tex->gxm_tex, tex_unit->u_mode); @@ -532,18 +532,18 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param) { tex_unit->u_mode = SCE_GXM_TEXTURE_ADDR_MIRROR_CLAMP; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } sceGxmTextureSetVAddrMode(&tex->gxm_tex, tex_unit->v_mode); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -594,12 +594,12 @@ void glTexParameterf(GLenum target, GLenum pname, GLfloat param) { sceGxmTextureSetVAddrMode(&tex->gxm_tex, tex_unit->v_mode); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -608,7 +608,7 @@ void glActiveTexture(GLenum texture) { // Changing current in use server texture unit #ifndef SKIP_ERROR_HANDLING if ((texture < GL_TEXTURE0) && (texture > GL_TEXTURE31)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; else #endif server_texture_unit = texture - GL_TEXTURE0; @@ -641,7 +641,7 @@ void glGenerateMipmap(GLenum target) { break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -667,12 +667,12 @@ void glTexEnvf(GLenum target, GLenum pname, GLfloat param) { tex_unit->env_mode = ADD; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; } } @@ -685,12 +685,12 @@ void glTexEnvfv(GLenum target, GLenum pname, GLfloat *param) { memcpy(&texenv_color.r, param, sizeof(GLfloat) * 4); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; } } @@ -722,12 +722,12 @@ void glTexEnvi(GLenum target, GLenum pname, GLint param) { } break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -743,7 +743,7 @@ void *vglGetTexDataPointer(GLenum target) { return tex->data; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } diff --git a/deps/vitaGL/source/vitaGL.c b/deps/vitaGL/source/vitaGL.c index 7b90dbe95d..925cd12948 100644 --- a/deps/vitaGL/source/vitaGL.c +++ b/deps/vitaGL/source/vitaGL.c @@ -699,7 +699,7 @@ void glGenBuffers(GLsizei n, GLuint *res) { int i = 0, j = 0; #ifndef SKIP_ERROR_HANDLING if (n < 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -716,7 +716,7 @@ void glGenBuffers(GLsizei n, GLuint *res) { void glBindBuffer(GLenum target, GLuint buffer) { #ifndef SKIP_ERROR_HANDLING if ((buffer != 0x0000) && ((buffer >= BUFFERS_ADDR + BUFFERS_NUM) || (buffer < BUFFERS_ADDR))) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -728,7 +728,7 @@ void glBindBuffer(GLenum target, GLuint buffer) { index_array_unit = buffer - BUFFERS_ADDR; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -736,7 +736,7 @@ void glBindBuffer(GLenum target, GLuint buffer) { void glDeleteBuffers(GLsizei n, const GLuint *gl_buffers) { #ifndef SKIP_ERROR_HANDLING if (n < 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -756,7 +756,7 @@ void glDeleteBuffers(GLsizei n, const GLuint *gl_buffers) { void glBufferData(GLenum target, GLsizei size, const GLvoid *data, GLenum usage) { #ifndef SKIP_ERROR_HANDLING if (size < 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -769,7 +769,7 @@ void glBufferData(GLenum target, GLsizei size, const GLvoid *data, GLenum usage) idx = index_array_unit; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } vglMemType type = VGL_MEM_VRAM; @@ -813,7 +813,7 @@ void glBlendFunc(GLenum sfactor, GLenum dfactor) { blend_sfactor_rgb = blend_sfactor_a = SCE_GXM_BLEND_FACTOR_SRC_ALPHA_SATURATE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } switch (dfactor) { @@ -851,7 +851,7 @@ void glBlendFunc(GLenum sfactor, GLenum dfactor) { blend_dfactor_rgb = blend_dfactor_a = SCE_GXM_BLEND_FACTOR_SRC_ALPHA_SATURATE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } if (blend_state) @@ -894,7 +894,7 @@ void glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum d blend_sfactor_rgb = SCE_GXM_BLEND_FACTOR_SRC_ALPHA_SATURATE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } switch (dstRGB) { @@ -932,7 +932,7 @@ void glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum d blend_dfactor_rgb = SCE_GXM_BLEND_FACTOR_SRC_ALPHA_SATURATE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } switch (srcAlpha) { @@ -970,7 +970,7 @@ void glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum d blend_sfactor_a = SCE_GXM_BLEND_FACTOR_SRC_ALPHA_SATURATE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } switch (dstAlpha) { @@ -1008,7 +1008,7 @@ void glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum d blend_dfactor_a = SCE_GXM_BLEND_FACTOR_SRC_ALPHA_SATURATE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } if (blend_state) @@ -1033,7 +1033,7 @@ void glBlendEquation(GLenum mode) { blend_func_rgb = blend_func_a = SCE_GXM_BLEND_FUNC_MAX; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } if (blend_state) @@ -1058,7 +1058,7 @@ void glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) { blend_func_rgb = SCE_GXM_BLEND_FUNC_MAX; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } switch (modeAlpha) { @@ -1078,7 +1078,7 @@ void glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) { blend_func_a = SCE_GXM_BLEND_FUNC_MAX; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } if (blend_state) @@ -1104,7 +1104,7 @@ void glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha void glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer) { #ifndef SKIP_ERROR_HANDLING if ((stride < 0) || (size < 2) || (size > 4)) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -1117,7 +1117,7 @@ void glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *poin tex_unit->vertex_array.size = sizeof(GLshort); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } @@ -1129,7 +1129,7 @@ void glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *poin void glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer) { #ifndef SKIP_ERROR_HANDLING if ((stride < 0) || (size < 3) || (size > 4)) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -1142,7 +1142,7 @@ void glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *point tex_unit->color_array.size = sizeof(GLshort); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } @@ -1154,7 +1154,7 @@ void glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *point void glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer) { #ifndef SKIP_ERROR_HANDLING if ((stride < 0) || (size < 2) || (size > 4)) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -1167,7 +1167,7 @@ void glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *po tex_unit->texture_array.size = sizeof(GLshort); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } @@ -1209,7 +1209,7 @@ void glDrawArrays(GLenum mode, GLint first, GLsizei count) { skip_draw = GL_TRUE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } if (!skip_draw) { @@ -1471,11 +1471,11 @@ void glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *gl_in GLboolean skip_draw = GL_FALSE; #ifndef SKIP_ERROR_HANDLING if (type != GL_UNSIGNED_SHORT) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; else if (phase == MODEL_CREATION) - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; else if (count < 0) - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; #endif switch (mode) { case GL_POINTS: @@ -1500,7 +1500,7 @@ void glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *gl_in skip_draw = GL_TRUE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } if (!skip_draw) { @@ -1734,7 +1734,7 @@ void glEnableClientState(GLenum array) { tex_unit->texture_array_state = GL_TRUE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -1752,7 +1752,7 @@ void glDisableClientState(GLenum array) { tex_unit->texture_array_state = GL_FALSE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } } @@ -1760,7 +1760,7 @@ void glDisableClientState(GLenum array) { void glClientActiveTexture(GLenum texture) { #ifndef SKIP_ERROR_HANDLING if ((texture < GL_TEXTURE0) && (texture > GL_TEXTURE31)) - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; else #endif client_texture_unit = texture - GL_TEXTURE0; @@ -1771,7 +1771,7 @@ void glClientActiveTexture(GLenum texture) { void vglVertexPointer(GLint size, GLenum type, GLsizei stride, GLuint count, const GLvoid *pointer) { #ifndef SKIP_ERROR_HANDLING if ((stride < 0) || (size < 2) || (size > 4)) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -1785,7 +1785,7 @@ void vglVertexPointer(GLint size, GLenum type, GLsizei stride, GLuint count, con bpe = sizeof(GLshort); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } tex_unit->vertex_object = gpu_pool_memalign(count * bpe * size, bpe * size); @@ -1806,7 +1806,7 @@ void vglVertexPointer(GLint size, GLenum type, GLsizei stride, GLuint count, con void vglColorPointer(GLint size, GLenum type, GLsizei stride, GLuint count, const GLvoid *pointer) { #ifndef SKIP_ERROR_HANDLING if ((stride < 0) || (size < 3) || (size > 4)) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -1823,7 +1823,7 @@ void vglColorPointer(GLint size, GLenum type, GLsizei stride, GLuint count, cons bpe = sizeof(uint8_t); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } tex_unit->color_object = gpu_pool_memalign(count * bpe * size, bpe * size); @@ -1845,7 +1845,7 @@ void vglColorPointer(GLint size, GLenum type, GLsizei stride, GLuint count, cons void vglTexCoordPointer(GLint size, GLenum type, GLsizei stride, GLuint count, const GLvoid *pointer) { #ifndef SKIP_ERROR_HANDLING if ((stride < 0) || (size < 2) || (size > 4)) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -1859,7 +1859,7 @@ void vglTexCoordPointer(GLint size, GLenum type, GLsizei stride, GLuint count, c bpe = sizeof(GLshort); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } tex_unit->texture_object = gpu_pool_memalign(count * bpe * size, bpe * size); @@ -1880,7 +1880,7 @@ void vglTexCoordPointer(GLint size, GLenum type, GLsizei stride, GLuint count, c void vglIndexPointer(GLenum type, GLsizei stride, GLuint count, const GLvoid *pointer) { #ifndef SKIP_ERROR_HANDLING if (stride < 0) { - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; return; } #endif @@ -1894,7 +1894,7 @@ void vglIndexPointer(GLenum type, GLsizei stride, GLuint count, const GLvoid *po bpe = sizeof(GLshort); break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } tex_unit->index_object = gpu_pool_memalign(count * bpe, bpe); @@ -1939,9 +1939,9 @@ void vglDrawObjects(GLenum mode, GLsizei count, GLboolean implicit_wvp) { int texture2d_idx = tex_unit->tex_id; #ifndef SKIP_ERROR_HANDLING if (phase == MODEL_CREATION) - error = GL_INVALID_OPERATION; + vgl_error = GL_INVALID_OPERATION; else if (count < 0) - error = GL_INVALID_VALUE; + vgl_error = GL_INVALID_VALUE; #endif GLboolean skip_draw = GL_FALSE; switch (mode) { @@ -1967,7 +1967,7 @@ void vglDrawObjects(GLenum mode, GLsizei count, GLboolean implicit_wvp) { skip_draw = GL_TRUE; break; default: - error = GL_INVALID_ENUM; + vgl_error = GL_INVALID_ENUM; break; } if (!skip_draw) {