mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for duplicated error symbol

Browse Source
This commit is contained in:
Francisco José García García 2019-12-13 11:26:15 +01:00
parent 758b3ad2cc
commit eef7611cf1
11 changed files with 150 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/vitaGL/source/custom_shaders.c vendored
View File

@ -127,7 +127,7 @@ GLuint glCreateShader(GLenum shaderType) {
shaders[res - 1].type = GL_VERTEX_SHADER;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
shaders[res - 1].valid = GL_TRUE;
@ -176,7 +176,7 @@ void glAttachShader(GLuint prog, GLuint shad) {
break;
}
} else
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
}
GLuint glCreateProgram(void) {
@ -365,7 +365,7 @@ void vglBindAttribLocation(GLuint prog, GLuint index, const GLchar *name, const
bpe = sizeof(uint8_t);
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
@ -383,7 +383,7 @@ void vglVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean nor
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (stride < 0) {
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -398,7 +398,7 @@ void vglVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean nor
bpe = sizeof(GLshort);
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}

12
deps/vitaGL/source/framebuffers.c vendored
View File

@ -32,7 +32,7 @@ uint32_t get_color_from_texture(uint32_t type) {
res = SCE_GXM_COLOR_FORMAT_U8_A;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
return res;
@ -48,7 +48,7 @@ void glGenFramebuffers(GLsizei n, GLuint *ids) {
int i = 0, j = 0;
#ifndef SKIP_ERROR_HANDLING
if (n < 0) {
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -67,7 +67,7 @@ void glGenFramebuffers(GLsizei n, GLuint *ids) {
void glDeleteFramebuffers(GLsizei n, GLuint *framebuffers) {
#ifndef SKIP_ERROR_HANDLING
if (n < 0) {
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -99,7 +99,7 @@ void glBindFramebuffer(GLenum target, GLuint fb) {
active_write_fb = active_read_fb = (framebuffer *)fb;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -116,7 +116,7 @@ void glFramebufferTexture(GLenum target, GLenum attachment, GLuint tex_id, GLint
fb = active_read_fb;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
@ -160,7 +160,7 @@ void glFramebufferTexture(GLenum target, GLenum attachment, GLuint tex_id, GLint
sceGxmCreateRenderTarget(&renderTargetParams, &fb->target);
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}

14
deps/vitaGL/source/get_info.c vendored
View File

@ -32,7 +32,7 @@ const GLubyte *glGetString(GLenum name) {
return extensions;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
return NULL;
break;
}
@ -62,7 +62,7 @@ void glGetBooleanv(GLenum pname, GLboolean *params) {
*params = GL_FALSE;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -91,7 +91,7 @@ void glGetFloatv(GLenum pname, GLfloat *data) {
*data = GENERIC_STACK_DEPTH;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -124,7 +124,7 @@ void glGetIntegerv(GLenum pname, GLint *data) {
data[3] = gl_viewport.h;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -157,14 +157,14 @@ GLboolean glIsEnabled(GLenum cap) {
ret = pol_offset_point;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
return ret;
}
GLenum glGetError(void) {
GLenum ret = error;
error = GL_NO_ERROR;
GLenum ret = _vitagl_error;
_vitagl_error = GL_NO_ERROR;
return ret;
}

2
deps/vitaGL/source/gxm.c vendored
View File

@ -27,7 +27,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 _vitagl_error = GL_NO_ERROR; // Error returned by glGetError
SceGxmShaderPatcher *gxm_shader_patcher; // sceGxmShaderPatcher shader patcher instance
matrix4x4 mvp_matrix; // ModelViewProjection Matrix

18
deps/vitaGL/source/legacy.c vendored
View File

@ -69,7 +69,7 @@ void glVertex3f(GLfloat x, GLfloat y, GLfloat z) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (phase != MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -100,7 +100,7 @@ void glVertex3fv(const GLfloat *v) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (phase != MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -191,7 +191,7 @@ void glTexCoord2fv(GLfloat *f) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (phase != MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -214,7 +214,7 @@ void glTexCoord2f(GLfloat s, GLfloat t) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (phase != MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -237,7 +237,7 @@ void glTexCoord2i(GLint s, GLint t) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (phase != MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -260,7 +260,7 @@ void glArrayElement(GLint i) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (i < 0) {
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -340,7 +340,7 @@ void glBegin(GLenum mode) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (phase == MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -377,7 +377,7 @@ void glBegin(GLenum mode) {
np = 4;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
@ -393,7 +393,7 @@ void glEnd(void) {
// Error handling
if (phase != MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif

24
deps/vitaGL/source/matrices.c vendored
View File

@ -28,7 +28,7 @@ void glMatrixMode(GLenum mode) {
matrix = &projection_matrix;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -37,10 +37,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;
_vitagl_error = GL_INVALID_OPERATION;
return;
} else if ((left == right) || (bottom == top) || (nearVal == farVal)) {
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -54,10 +54,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;
_vitagl_error = GL_INVALID_OPERATION;
return;
} else if ((left == right) || (bottom == top) || (nearVal < 0) || (farVal < 0)) {
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -130,7 +130,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;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -153,7 +153,7 @@ void glPushMatrix(void) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (phase == MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -162,7 +162,7 @@ void glPushMatrix(void) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (modelview_stack_counter >= MODELVIEW_STACK_DEPTH) {
error = GL_STACK_OVERFLOW;
_vitagl_error = GL_STACK_OVERFLOW;
} else
#endif
// Copying current matrix into the matrix stack and increasing stack counter
@ -172,7 +172,7 @@ void glPushMatrix(void) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (projection_stack_counter >= GENERIC_STACK_DEPTH) {
error = GL_STACK_OVERFLOW;
_vitagl_error = GL_STACK_OVERFLOW;
} else
#endif
// Copying current matrix into the matrix stack and increasing stack counter
@ -184,7 +184,7 @@ void glPopMatrix(void) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (phase == MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -193,7 +193,7 @@ void glPopMatrix(void) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (modelview_stack_counter == 0)
error = GL_STACK_UNDERFLOW;
_vitagl_error = GL_STACK_UNDERFLOW;
else
#endif
// Copying last matrix on stack into current matrix and decreasing stack counter
@ -203,7 +203,7 @@ void glPopMatrix(void) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (projection_stack_counter == 0)
error = GL_STACK_UNDERFLOW;
_vitagl_error = GL_STACK_UNDERFLOW;
else
#endif
// Copying last matrix on stack into current matrix and decreasing stack counter

32
deps/vitaGL/source/misc.c vendored
View File

@ -101,7 +101,7 @@ void glPolygonMode(GLenum face, GLenum mode) {
new_mode = SCE_GXM_POLYGON_MODE_TRIANGLE_FILL;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
switch (face) {
@ -122,7 +122,7 @@ void glPolygonMode(GLenum face, GLenum mode) {
sceGxmSetBackPolygonMode(gxm_context, new_mode);
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
return;
}
update_polygon_offset();
@ -149,7 +149,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -182,7 +182,7 @@ void glDepthRangef(GLfloat nearVal, GLfloat farVal) {
void glEnable(GLenum cap) {
#ifndef SKIP_ERROR_HANDLING
if (phase == MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -235,7 +235,7 @@ void glEnable(GLenum cap) {
clip_plane0 = GL_TRUE;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -243,7 +243,7 @@ void glEnable(GLenum cap) {
void glDisable(GLenum cap) {
#ifndef SKIP_ERROR_HANDLING
if (phase == MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -296,7 +296,7 @@ void glDisable(GLenum cap) {
clip_plane0 = GL_FALSE;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -393,7 +393,7 @@ void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format
}
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
@ -411,12 +411,12 @@ void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format
}
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -425,7 +425,7 @@ void glLineWidth(GLfloat width) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (width <= 0) {
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -439,7 +439,7 @@ void glPointSize(GLfloat size) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (size <= 0) {
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -465,7 +465,7 @@ void glFogf(GLenum pname, GLfloat param) {
fog_far = param;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -489,7 +489,7 @@ void glFogfv(GLenum pname, const GLfloat *params) {
memcpy(&fog_color.r, params, sizeof(vector4f));
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -510,7 +510,7 @@ void glFogi(GLenum pname, const GLint param) {
fog_far = param;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -530,7 +530,7 @@ void glClipPlane(GLenum plane, const GLdouble *equation) {
memcpy(&clip_plane0_eq.x, &temp.x, sizeof(vector4f));
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}

2
deps/vitaGL/source/shared.h vendored
View File

@ -97,7 +97,7 @@ extern float y_scale;
extern float z_scale;
extern SceGxmContext *gxm_context; // sceGxm context instance
extern GLenum error; // Error returned by glGetError
extern GLenum _vitagl_error; // Error returned by glGetError
extern SceGxmShaderPatcher *gxm_shader_patcher; // sceGxmShaderPatcher shader patcher instance
matrix4x4 mvp_matrix; // ModelViewProjection Matrix

42
deps/vitaGL/source/tests.c vendored
View File

@ -282,7 +282,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -340,7 +340,7 @@ void glDepthMask(GLboolean flag) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (phase == MODEL_CREATION) {
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
return;
}
#endif
@ -362,36 +362,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;
_vitagl_error = GL_INVALID_ENUM;
if (!change_stencil_config(&depth_fail_front, dpfail))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
if (!change_stencil_config(&depth_pass_front, dppass))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
case GL_BACK:
if (!change_stencil_config(&stencil_fail_back, sfail))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
if (!change_stencil_config(&depth_fail_back, dpfail))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
if (!change_stencil_config(&depth_pass_front, dppass))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
case GL_FRONT_AND_BACK:
if (!change_stencil_config(&stencil_fail_front, sfail))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
if (!change_stencil_config(&stencil_fail_back, sfail))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
if (!change_stencil_config(&depth_fail_front, dpfail))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
if (!change_stencil_config(&depth_fail_back, dpfail))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
if (!change_stencil_config(&depth_pass_front, dppass))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
if (!change_stencil_config(&depth_pass_back, dppass))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
change_stencil_settings();
@ -406,26 +406,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;
_vitagl_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;
_vitagl_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;
_vitagl_error = GL_INVALID_ENUM;
if (!change_stencil_func_config(&stencil_func_back, func))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
stencil_mask_front = stencil_mask_back = mask;
stencil_ref_front = stencil_ref_back = ref;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
change_stencil_settings();
@ -448,7 +448,7 @@ void glStencilMaskSeparate(GLenum face, GLuint mask) {
stencil_mask_front_write = stencil_mask_back_write = mask;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
return;
}
change_stencil_settings();

64
deps/vitaGL/source/textures.c vendored
View File

@ -19,7 +19,7 @@ void glGenTextures(GLsizei n, GLuint *res) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (n < 0) {
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -49,7 +49,7 @@ void glBindTexture(GLenum target, GLuint texture) {
tex_unit->tex_id = texture;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -58,7 +58,7 @@ void glDeleteTextures(GLsizei n, const GLuint *gl_textures) {
#ifndef SKIP_ERROR_HANDLING
// Error handling
if (n < 0) {
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -119,7 +119,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt
data_bpp = 1;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
@ -131,7 +131,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt
data_bpp = 2;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
@ -142,7 +142,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt
read_cb = readRGB;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
@ -157,7 +157,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt
read_cb = readRGBA5551;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
@ -197,13 +197,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;
_vitagl_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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
@ -227,7 +227,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -266,7 +266,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G
data_bpp = 1;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
@ -277,7 +277,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G
data_bpp = 2;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
@ -288,7 +288,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G
read_cb = readRGB;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
@ -303,7 +303,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G
read_cb = readRGBA5551;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
@ -349,7 +349,7 @@ void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, G
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -370,12 +370,12 @@ void glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum fo
bpp = 4;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
@ -409,7 +409,7 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param) {
case GL_LINEAR_MIPMAP_LINEAR: // TODO: Implement this
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
sceGxmTextureSetMinFilter(&tex->gxm_tex, tex_unit->min_filter);
@ -431,7 +431,7 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param) {
case GL_LINEAR_MIPMAP_LINEAR: // TODO: Implement this
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
sceGxmTextureSetMagFilter(&tex->gxm_tex, tex_unit->mag_filter);
@ -448,7 +448,7 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param) {
tex_unit->u_mode = SCE_GXM_TEXTURE_ADDR_MIRROR;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
sceGxmTextureSetUAddrMode(&tex->gxm_tex, tex_unit->u_mode);
@ -465,18 +465,18 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param) {
tex_unit->v_mode = SCE_GXM_TEXTURE_ADDR_MIRROR;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
sceGxmTextureSetVAddrMode(&tex->gxm_tex, tex_unit->v_mode);
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -523,12 +523,12 @@ void glTexParameterf(GLenum target, GLenum pname, GLfloat param) {
sceGxmTextureSetVAddrMode(&tex->gxm_tex, tex_unit->v_mode);
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -537,7 +537,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;
_vitagl_error = GL_INVALID_ENUM;
else
#endif
server_texture_unit = texture - GL_TEXTURE0;
@ -570,7 +570,7 @@ void glGenerateMipmap(GLenum target) {
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -596,12 +596,12 @@ void glTexEnvf(GLenum target, GLenum pname, GLfloat param) {
tex_unit->env_mode = ADD;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
}
}
@ -633,12 +633,12 @@ void glTexEnvi(GLenum target, GLenum pname, GLint param) {
}
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -654,7 +654,7 @@ void *vglGetTexDataPointer(GLenum target) {
return tex->data;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}

80
deps/vitaGL/source/vitaGL.c vendored
View File

@ -697,7 +697,7 @@ void glGenBuffers(GLsizei n, GLuint *res) {
int i = 0, j = 0;
#ifndef SKIP_ERROR_HANDLING
if (n < 0) {
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -714,7 +714,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -726,7 +726,7 @@ void glBindBuffer(GLenum target, GLuint buffer) {
index_array_unit = buffer - BUFFERS_ADDR;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -734,7 +734,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -754,7 +754,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -767,7 +767,7 @@ void glBufferData(GLenum target, GLsizei size, const GLvoid *data, GLenum usage)
idx = index_array_unit;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
vglMemType type = VGL_MEM_VRAM;
@ -811,7 +811,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;
_vitagl_error = GL_INVALID_ENUM;
break;
}
switch (dfactor) {
@ -849,7 +849,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;
_vitagl_error = GL_INVALID_ENUM;
break;
}
if (blend_state)
@ -892,7 +892,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;
_vitagl_error = GL_INVALID_ENUM;
break;
}
switch (dstRGB) {
@ -930,7 +930,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;
_vitagl_error = GL_INVALID_ENUM;
break;
}
switch (srcAlpha) {
@ -968,7 +968,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;
_vitagl_error = GL_INVALID_ENUM;
break;
}
switch (dstAlpha) {
@ -1006,7 +1006,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;
_vitagl_error = GL_INVALID_ENUM;
break;
}
if (blend_state)
@ -1031,7 +1031,7 @@ void glBlendEquation(GLenum mode) {
blend_func_rgb = blend_func_a = SCE_GXM_BLEND_FUNC_MAX;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
if (blend_state)
@ -1056,7 +1056,7 @@ void glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) {
blend_func_rgb = SCE_GXM_BLEND_FUNC_MAX;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
switch (modeAlpha) {
@ -1076,7 +1076,7 @@ void glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) {
blend_func_a = SCE_GXM_BLEND_FUNC_MAX;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
if (blend_state)
@ -1102,7 +1102,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -1115,7 +1115,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;
_vitagl_error = GL_INVALID_ENUM;
break;
}
@ -1127,7 +1127,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -1140,7 +1140,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;
_vitagl_error = GL_INVALID_ENUM;
break;
}
@ -1152,7 +1152,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -1165,7 +1165,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;
_vitagl_error = GL_INVALID_ENUM;
break;
}
@ -1207,7 +1207,7 @@ void glDrawArrays(GLenum mode, GLint first, GLsizei count) {
skip_draw = GL_TRUE;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
if (!skip_draw) {
@ -1473,11 +1473,11 @@ void glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *gl_in
if (tex_unit->vertex_array_state) {
#ifndef SKIP_ERROR_HANDLING
if (type != GL_UNSIGNED_SHORT)
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
else if (phase == MODEL_CREATION)
error = GL_INVALID_OPERATION;
_vitagl_error = GL_INVALID_OPERATION;
else if (count < 0)
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
#endif
switch (mode) {
case GL_POINTS:
@ -1502,7 +1502,7 @@ void glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *gl_in
skip_draw = GL_TRUE;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
if (!skip_draw) {
@ -1739,7 +1739,7 @@ void glEnableClientState(GLenum array) {
tex_unit->texture_array_state = GL_TRUE;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -1757,7 +1757,7 @@ void glDisableClientState(GLenum array) {
tex_unit->texture_array_state = GL_FALSE;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
}
@ -1765,7 +1765,7 @@ void glDisableClientState(GLenum array) {
void glClientActiveTexture(GLenum texture) {
#ifndef SKIP_ERROR_HANDLING
if ((texture < GL_TEXTURE0) && (texture > GL_TEXTURE31))
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
else
#endif
client_texture_unit = texture - GL_TEXTURE0;
@ -1776,7 +1776,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -1790,7 +1790,7 @@ void vglVertexPointer(GLint size, GLenum type, GLsizei stride, GLuint count, con
bpe = sizeof(GLshort);
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
tex_unit->vertex_object = gpu_pool_memalign(count * bpe * size, bpe * size);
@ -1811,7 +1811,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -1828,7 +1828,7 @@ void vglColorPointer(GLint size, GLenum type, GLsizei stride, GLuint count, cons
bpe = sizeof(uint8_t);
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
tex_unit->color_object = gpu_pool_memalign(count * bpe * size, bpe * size);
@ -1850,7 +1850,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -1864,7 +1864,7 @@ void vglTexCoordPointer(GLint size, GLenum type, GLsizei stride, GLuint count, c
bpe = sizeof(GLshort);
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
tex_unit->texture_object = gpu_pool_memalign(count * bpe * size, bpe * size);
@ -1885,7 +1885,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;
_vitagl_error = GL_INVALID_VALUE;
return;
}
#endif
@ -1899,7 +1899,7 @@ void vglIndexPointer(GLenum type, GLsizei stride, GLuint count, const GLvoid *po
bpe = sizeof(GLshort);
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
tex_unit->index_object = gpu_pool_memalign(count * bpe, bpe);
@ -1944,9 +1944,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;
_vitagl_error = GL_INVALID_OPERATION;
else if (count < 0)
error = GL_INVALID_VALUE;
_vitagl_error = GL_INVALID_VALUE;
#endif
GLboolean skip_draw = GL_FALSE;
switch (mode) {
@ -1972,7 +1972,7 @@ void vglDrawObjects(GLenum mode, GLsizei count, GLboolean implicit_wvp) {
skip_draw = GL_TRUE;
break;
default:
error = GL_INVALID_ENUM;
_vitagl_error = GL_INVALID_ENUM;
break;
}
if (!skip_draw) {