mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-01 00:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Squashed 'deps/vitaGL/' changes from 9a6e4b3397..fb87308d15

Browse Source 
fb87308d15 Added vglBindPackedAttribLocation.
7e933f6051 Added NO_DEBUG compile option.
28e8516718 Faster textures storing when format is the same as internal format.

git-subtree-dir: deps/vitaGL
git-subtree-split: fb87308d15a387d2549fb45d860b3d87ede8a0ca
This commit is contained in:
Francisco José García García 2020-05-31 17:18:53 +02:00
parent 78c27dc77a
commit 56797b8841
6 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -17,6 +17,10 @@ AR = $(PREFIX)-gcc-ar
CFLAGS = -g -Wl,-q -O2 -ffast-math -mtune=cortex-a9 -mfpu=neon -flto -ftree-vectorize -DSTB_DXT_IMPLEMENTATION CFLAGS = -g -Wl,-q -O2 -ffast-math -mtune=cortex-a9 -mfpu=neon -flto -ftree-vectorize -DSTB_DXT_IMPLEMENTATION
ASFLAGS = $(CFLAGS) ASFLAGS = $(CFLAGS)
ifeq ($(NO_DEBUG),1)
CFLAGS += -DSKIP_ERROR_HANDLING
endif
all: $(TARGET).a all: $(TARGET).a
$(TARGET).a: $(OBJS) $(TARGET).a: $(OBJS)

12
source/custom_shaders.c
View File

@ -357,8 +357,7 @@ void glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, cons
* ------------------------------ * ------------------------------
*/ */
// Equivalent of glBindAttribLocation but for sceGxm architecture void vglBindPackedAttribLocation(GLuint prog, GLuint index, const GLchar *name, const GLuint num, const GLenum type, GLuint offset) {
void vglBindAttribLocation(GLuint prog, GLuint index, const GLchar *name, const GLuint num, const GLenum type) {
// Grabbing passed program // Grabbing passed program
program *p = &progs[prog - 1]; program *p = &progs[prog - 1];
SceGxmVertexAttribute *attributes = &p->attr[index]; SceGxmVertexAttribute *attributes = &p->attr[index];
@ -369,7 +368,7 @@ void vglBindAttribLocation(GLuint prog, GLuint index, const GLchar *name, const
// Setting stream index and offset values // Setting stream index and offset values
attributes->streamIndex = index; attributes->streamIndex = index;
attributes->offset = 0; attributes->offset = offset;
// Detecting attribute format and size // Detecting attribute format and size
int bpe; int bpe;
@ -396,7 +395,12 @@ void vglBindAttribLocation(GLuint prog, GLuint index, const GLchar *name, const
p->attr_num = index + 1; p->attr_num = index + 1;
} }
// Equivalent of glVertexAttribLocation but for sceGxm architecture // Equivalent of glBindAttribLocation but for sceGxm architecture
void vglBindAttribLocation(GLuint prog, GLuint index, const GLchar *name, const GLuint num, const GLenum type) {
vglBindPackedAttribLocation(prog, index, name, num, type, 0);
}
// Equivalent of glVertexAttribPointer but for sceGxm architecture
void vglVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint count, const GLvoid *pointer) { void vglVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint count, const GLvoid *pointer) {
#ifndef SKIP_ERROR_HANDLING #ifndef SKIP_ERROR_HANDLING
// Error handling // Error handling

9
source/textures.c
View File

@ -101,6 +101,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt
SceGxmTextureFormat tex_format; SceGxmTextureFormat tex_format;
uint8_t data_bpp = 0; uint8_t data_bpp = 0;
uint8_t fast_store = GL_FALSE;
// Support for legacy GL1.0 internalFormat // Support for legacy GL1.0 internalFormat
switch (internalFormat) { switch (internalFormat) {
@ -157,7 +158,8 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt
switch (type) { switch (type) {
case GL_UNSIGNED_BYTE: case GL_UNSIGNED_BYTE:
data_bpp = 3; data_bpp = 3;
read_cb = readRGB; if (internalFormat == GL_RGB) fast_store = GL_TRUE;
else read_cb = readRGB;
break; break;
default: default:
error = GL_INVALID_ENUM; error = GL_INVALID_ENUM;
@ -168,7 +170,8 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt
switch (type) { switch (type) {
case GL_UNSIGNED_BYTE: case GL_UNSIGNED_BYTE:
data_bpp = 4; data_bpp = 4;
read_cb = readRGBA; if (internalFormat == GL_RGBA) fast_store = GL_TRUE;
else read_cb = readRGBA;
break; break;
case GL_UNSIGNED_SHORT_5_5_5_1: case GL_UNSIGNED_SHORT_5_5_5_1:
data_bpp = 2; data_bpp = 2;
@ -236,7 +239,7 @@ void glTexImage2D(GLenum target, GLint level, GLint internalFormat, GLsizei widt
tex->type = internalFormat; tex->type = internalFormat;
tex->write_cb = write_cb; tex->write_cb = write_cb;
if (level == 0) if (level == 0)
if (tex->write_cb) gpu_alloc_texture(width, height, tex_format, data, tex, data_bpp, read_cb, write_cb); if (tex->write_cb) gpu_alloc_texture(width, height, tex_format, data, tex, data_bpp, read_cb, write_cb, fast_store);
else gpu_alloc_compressed_texture(width, height, tex_format, data, tex, data_bpp, read_cb); else gpu_alloc_compressed_texture(width, height, tex_format, data, tex, data_bpp, read_cb);
else { else {
gpu_alloc_mipmaps(level, tex); gpu_alloc_mipmaps(level, tex);

25
source/utils/gpu_utils.c
View File

@ -255,7 +255,7 @@ void gpu_free_texture(texture *tex) {
tex->valid = 0; tex->valid = 0;
} }
void gpu_alloc_texture(uint32_t w, uint32_t h, SceGxmTextureFormat format, const void *data, texture *tex, uint8_t src_bpp, uint32_t (*read_cb)(void *), void (*write_cb)(void *, uint32_t)) { void gpu_alloc_texture(uint32_t w, uint32_t h, SceGxmTextureFormat format, const void *data, texture *tex, uint8_t src_bpp, uint32_t (*read_cb)(void *), void (*write_cb)(void *, uint32_t), uint8_t fast_store) {
// If there's already a texture in passed texture object we first dealloc it // If there's already a texture in passed texture object we first dealloc it
if (tex->valid) if (tex->valid)
gpu_free_texture(tex); gpu_free_texture(tex);
@ -274,13 +274,22 @@ void gpu_alloc_texture(uint32_t w, uint32_t h, SceGxmTextureFormat format, const
int i, j; int i, j;
uint8_t *src = (uint8_t *)data; uint8_t *src = (uint8_t *)data;
uint8_t *dst; uint8_t *dst;
for (i = 0; i < h; i++) { if (fast_store) { // Internal Format and Data Format are the same, we can just use memcpy for better performance
dst = ((uint8_t *)texture_data) + (ALIGN(w, 8) * bpp) * i; uint32_t line_size = w * bpp;
for (j = 0; j < w; j++) { for (i = 0; i < h; i++) {
uint32_t clr = read_cb(src); dst = ((uint8_t *)texture_data) + (ALIGN(w, 8) * bpp) * i;
write_cb(dst, clr); memcpy(dst, src, line_size);
src += src_bpp; src += line_size;
dst += bpp; }
} else { // Different internal and data formats, we need to go with slower callbacks system
for (i = 0; i < h; i++) {
dst = ((uint8_t *)texture_data) + (ALIGN(w, 8) * bpp) * i;
for (j = 0; j < w; j++) {
uint32_t clr = read_cb(src);
write_cb(dst, clr);
src += src_bpp;
dst += bpp;
}
} }
} }
} else } else

2
source/utils/gpu_utils.h
View File

@ -82,7 +82,7 @@ void gpu_pool_init(uint32_t temp_pool_size);
int tex_format_to_bytespp(SceGxmTextureFormat format); int tex_format_to_bytespp(SceGxmTextureFormat format);
// Alloc a texture // Alloc a texture
void gpu_alloc_texture(uint32_t w, uint32_t h, SceGxmTextureFormat format, const void *data, texture *tex, uint8_t src_bpp, uint32_t (*read_cb)(void *), void (*write_cb)(void *, uint32_t)); void gpu_alloc_texture(uint32_t w, uint32_t h, SceGxmTextureFormat format, const void *data, texture *tex, uint8_t src_bpp, uint32_t (*read_cb)(void *), void (*write_cb)(void *, uint32_t), uint8_t fast_store);
// Alloc a compresseed texture // Alloc a compresseed texture
void gpu_alloc_compressed_texture(uint32_t w, uint32_t h, SceGxmTextureFormat format, const void *data, texture *tex, uint8_t src_bpp, uint32_t (*read_cb)(void *)); void gpu_alloc_compressed_texture(uint32_t w, uint32_t h, SceGxmTextureFormat format, const void *data, texture *tex, uint8_t src_bpp, uint32_t (*read_cb)(void *));

1
source/vitaGL.h
View File

@ -378,6 +378,7 @@ void vglVertexPointerMapped(const GLvoid *pointer);
// VGL_EXT_gxp_shaders extension implementation // VGL_EXT_gxp_shaders extension implementation
void vglBindAttribLocation(GLuint prog, GLuint index, const GLchar *name, const GLuint num, const GLenum type); void vglBindAttribLocation(GLuint prog, GLuint index, const GLchar *name, const GLuint num, const GLenum type);
void vglBindPackedAttribLocation(GLuint prog, GLuint index, const GLchar *name, const GLuint num, const GLenum type, GLuint offset);
void vglVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint count, const GLvoid *pointer); void vglVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint count, const GLvoid *pointer);
void vglVertexAttribPointerMapped(GLuint index, const GLvoid *pointer); void vglVertexAttribPointerMapped(GLuint index, const GLvoid *pointer);