aboutsummaryrefslogtreecommitdiff
path: root/src/graphics/texture.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/graphics/texture.c')
-rw-r--r--src/graphics/texture.c103
1 files changed, 40 insertions, 63 deletions
diff --git a/src/graphics/texture.c b/src/graphics/texture.c
index 4c7f68c..1427e6b 100644
--- a/src/graphics/texture.c
+++ b/src/graphics/texture.c
@@ -1,108 +1,85 @@
#include "../../include/mgl/graphics/texture.h"
+#include "../../include/mgl/graphics/image.h"
#include "../../include/mgl/mgl.h"
-
-#define STBI_NO_PSD
-#define STBI_NO_TGA
-#define STBI_NO_HDR
-#define STBI_NO_PIC
-#define STBI_NO_PNM
-#define STB_IMAGE_IMPLEMENTATION
-#include "../../external/stb_image.h"
+#include <stdio.h>
/* TODO: Check for glTexImage2D failure */
static int mgl_texture_format_to_opengl_format(mgl_texture_format format) {
switch(format) {
- case MGL_TEXTURE_ALPHA: return GL_ALPHA8;
- case MGL_TEXTURE_GRAY: return GL_LUMINANCE8;
- case MGL_TEXTURE_GRAY_ALPHA: return GL_LUMINANCE8_ALPHA8;
- case MGL_TEXTURE_RGB: return GL_RGB8;
- case MGL_TEXTURE_RGBA: return GL_RGBA8;
+ case MGL_TEXTURE_FORMAT_ALPHA: return GL_ALPHA8;
+ case MGL_TEXTURE_FORMAT_GRAY: return GL_LUMINANCE8;
+ case MGL_TEXTURE_FORMAT_GRAY_ALPHA: return GL_LUMINANCE8_ALPHA8;
+ case MGL_TEXTURE_FORMAT_RGB: return GL_RGB8;
+ case MGL_TEXTURE_FORMAT_RGBA: return GL_RGBA8;
}
return 0;
}
static int mgl_texture_format_to_compressed_opengl_format(mgl_texture_format format) {
switch(format) {
- case MGL_TEXTURE_ALPHA: return GL_ALPHA8;
- case MGL_TEXTURE_GRAY: return GL_LUMINANCE8;
- case MGL_TEXTURE_GRAY_ALPHA: return GL_LUMINANCE8_ALPHA8;
- case MGL_TEXTURE_RGB: return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
- case MGL_TEXTURE_RGBA: return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+ case MGL_TEXTURE_FORMAT_ALPHA: return GL_ALPHA8;
+ case MGL_TEXTURE_FORMAT_GRAY: return GL_LUMINANCE8;
+ case MGL_TEXTURE_FORMAT_GRAY_ALPHA: return GL_LUMINANCE8_ALPHA8;
+ case MGL_TEXTURE_FORMAT_RGB: return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+ case MGL_TEXTURE_FORMAT_RGBA: return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
}
return 0;
}
static int mgl_texture_format_to_source_opengl_format(mgl_texture_format format) {
switch(format) {
- case MGL_TEXTURE_ALPHA: return GL_ALPHA;
- case MGL_TEXTURE_GRAY: return GL_LUMINANCE8;
- case MGL_TEXTURE_GRAY_ALPHA: return GL_LUMINANCE8_ALPHA8;
- case MGL_TEXTURE_RGB: return GL_RGB;
- case MGL_TEXTURE_RGBA: return GL_RGBA;
+ case MGL_TEXTURE_FORMAT_ALPHA: return GL_ALPHA;
+ case MGL_TEXTURE_FORMAT_GRAY: return GL_LUMINANCE8;
+ case MGL_TEXTURE_FORMAT_GRAY_ALPHA: return GL_LUMINANCE8_ALPHA8;
+ case MGL_TEXTURE_FORMAT_RGB: return GL_RGB;
+ case MGL_TEXTURE_FORMAT_RGBA: return GL_RGBA;
}
return 0;
}
-static mgl_texture_format stbi_format_to_mgl_texture_format(int stbi_format) {
- switch(stbi_format) {
- case STBI_grey:
- return MGL_TEXTURE_GRAY;
- case STBI_grey_alpha:
- return MGL_TEXTURE_GRAY_ALPHA;
- case STBI_rgb:
- return MGL_TEXTURE_RGB;
- case STBI_rgb_alpha:
- return MGL_TEXTURE_RGBA;
+static mgl_texture_format mgl_image_format_to_mgl_texture_format(mgl_image_format image_format) {
+ switch(image_format) {
+ case MGL_IMAGE_FORMAT_ALPHA: return MGL_TEXTURE_FORMAT_ALPHA;
+ case MGL_IMAGE_FORMAT_GRAY: return MGL_TEXTURE_FORMAT_GRAY;
+ case MGL_IMAGE_FORMAT_GRAY_ALPHA: return MGL_TEXTURE_FORMAT_GRAY_ALPHA;
+ case MGL_IMAGE_FORMAT_RGB: return MGL_TEXTURE_FORMAT_RGB;
+ case MGL_IMAGE_FORMAT_RGBA: return MGL_TEXTURE_FORMAT_RGBA;
}
return 0;
}
-/* TODO: Ensure texture is power of 2 if the hardware doesn't support non power of two textures */
-/* TODO: Verify if source format should always be 4 components (RGBA) because apparently if its another format then opengl will internally convert it to RGBA */
int mgl_texture_load_from_file(mgl_texture *self, const char *filepath, mgl_texture_load_options *load_options) {
self->id = 0;
+ self->width = 0;
+ self->height = 0;
- int format;
- stbi_uc *image_data = stbi_load(filepath, &self->width, &self->height, &format, 0);
- if(!image_data) {
- fprintf(stderr, "Error: failed to load image %s, error: %s\n", filepath, stbi_failure_reason());
+ mgl_image image;
+ if(mgl_image_load_from_file(&image, filepath) != 0)
return -1;
- }
- self->format = stbi_format_to_mgl_texture_format(format);
-
- mgl_context *context = mgl_get_context();
- context->gl.glGenTextures(1, &self->id);
- if(self->id == 0) {
- fprintf(stderr, "Error: failed to load image %s", filepath);
- stbi_image_free(image_data);
- return -1;
- }
-
- const int opengl_texture_format = load_options && load_options->compressed ? mgl_texture_format_to_compressed_opengl_format(self->format) : mgl_texture_format_to_opengl_format(self->format);
- context->gl.glBindTexture(GL_TEXTURE_2D, self->id);
- context->gl.glTexImage2D(GL_TEXTURE_2D, 0, opengl_texture_format, self->width, self->height, 0, mgl_texture_format_to_source_opengl_format(self->format), GL_UNSIGNED_BYTE, image_data);
- context->gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- context->gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- context->gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- context->gl.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- context->gl.glBindTexture(GL_TEXTURE_2D, 0);
+ int result = mgl_texture_load_from_image(self, &image, load_options);
+ mgl_image_unload(&image);
+ return result;
+}
- stbi_image_free(image_data);
- return 0;
+int mgl_texture_load_from_image(mgl_texture *self, mgl_image *image, mgl_texture_load_options *load_options) {
+ return mgl_texture_load_from_memory(self, image->data, image->width, image->height, image->format, load_options);
}
-int mgl_texture_load_from_memory(mgl_texture *self, const unsigned char *data, int width, int height, mgl_texture_format format, mgl_texture_load_options *load_options) {
+int mgl_texture_load_from_memory(mgl_texture *self, const unsigned char *data, int width, int height, mgl_image_format format, mgl_texture_load_options *load_options) {
self->id = 0;
self->width = width;
self->height = height;
- self->format = format;
+ self->format = mgl_image_format_to_mgl_texture_format(format);
mgl_context *context = mgl_get_context();
context->gl.glGenTextures(1, &self->id);
- if(self->id == 0)
+ if(self->id == 0) {
+ fprintf(stderr, "Error: failed to load image from memory (glGenTextures failed)\n");
+ mgl_texture_unload(self);
return -1;
+ }
const int opengl_texture_format = load_options && load_options->compressed ? mgl_texture_format_to_compressed_opengl_format(self->format) : mgl_texture_format_to_opengl_format(self->format);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 13:59:15 +0000