piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Make texture loading/deleting/drawing backend non-specific by making them happen in the backend instead of somewhere else. Just a clean up commit really.

Browse Source
This commit is contained in:
Ryan Houdek
2013-09-02 01:40:05 -05:00
parent 0219049c03
commit 831963616f
9 changed files with 83 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Source/Core/DolphinWX/Src/Android/TextureLoader.cpp
View File

@ -17,8 +17,7 @@
#include "GLInterface.h"
#include <png.h>
GLuint LoadPNG(const char *filename)
char* LoadPNG(const char *filename, u32 &width, u32 &height)
{
FILE *infile; /* PNG file pointer */
png_structp png_ptr; /* internally used by libpng */
@ -31,8 +30,8 @@ GLuint LoadPNG(const char *filename)
int bit_depth;
int color_type;
png_uint_32 width; /* PNG image width in pixels */
png_uint_32 height; /* PNG image height in pixels */
png_uint_32 _width;
png_uint_32 _height;
unsigned int rowbytes; /* raw bytes at row n in image */
image_data = NULL;
@ -42,7 +41,7 @@ GLuint LoadPNG(const char *filename)
/* Open the file. */
infile = fopen(filename, "rb");
if (!infile)
return 0;
return NULL;
/*
* 13.3 readpng_init()
@ -53,7 +52,7 @@ GLuint LoadPNG(const char *filename)
if (!png_check_sig((unsigned char *) sig, 8)) {
fclose(infile);
return 0;
return NULL;
}
/*
@ -62,14 +61,14 @@ GLuint LoadPNG(const char *filename)
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (!png_ptr) {
fclose(infile);
return 4; /* out of memory */
return NULL; /* out of memory */
}
info_ptr = png_create_info_struct(png_ptr);
if (!info_ptr) {
png_destroy_read_struct(&png_ptr, (png_infopp) NULL, (png_infopp) NULL);
fclose(infile);
return 4; /* out of memory */
return NULL; /* out of memory */
}
@ -80,7 +79,7 @@ GLuint LoadPNG(const char *filename)
if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
fclose(infile);
return 0;
return NULL;
}
/*
@ -108,7 +107,7 @@ GLuint LoadPNG(const char *filename)
/* read all the info up to the image data */
png_read_info(png_ptr, info_ptr);
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth,
png_get_IHDR(png_ptr, info_ptr, &_width, &_height, &bit_depth,
&color_type, NULL, NULL, NULL);
/* Set up some transforms. */
@ -129,22 +128,22 @@ GLuint LoadPNG(const char *filename)
/* Allocate the image_data buffer. */
if ((image_data = (char *) malloc(rowbytes * height))==NULL) {
if ((image_data = (char *) malloc(rowbytes * _height))==NULL) {
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
return 4;
return NULL;
}
if ((row_pointers = (png_bytepp)malloc(height*sizeof(png_bytep))) == NULL) {
if ((row_pointers = (png_bytepp)malloc(_height*sizeof(png_bytep))) == NULL) {
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
free(image_data);
image_data = NULL;
return 4;
return NULL;
}
/* set the individual row_pointers to point at the correct offsets */
for (i = 0; i < height; ++i)
for (i = 0; i < _height; ++i)
row_pointers[i] = (png_byte*)(image_data + i*rowbytes);
@ -161,19 +160,7 @@ GLuint LoadPNG(const char *filename)
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
fclose(infile);
GLuint Texture = 0;
glGenTextures(1, &Texture);
/* create a new texture object
* and bind it to texname (unsigned integer > 0)
*/
glBindTexture(GL_TEXTURE_2D, Texture);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
GL_RGBA, GL_UNSIGNED_BYTE, image_data);
return Texture;
width = (u32)_width;
height = (u32)_height;
return image_data;
}