18f4fc8123
- Font loading - Measuring for formatting & justification - Utf8 Glyph walking - Commented example in oogabooga/examples/text_rendering.c - Small 2D renderer refactor - Pass 8-bit integers "type" and "sampler_index" to shader - Sample texture differently depending on "type" (text or regular quad) - Sample with nearest/linear min/mag depending on sampler_index - Set min/mag filtering in Draw_Quad - Images are now created and deleted directly with gfx calls rather than deferring it for gfx_update. - We can now set image sub data with gfx_set_image_data() - Images are no longer hard coded to 4 channels - Utf8 utility: - utf8_to_utf32(): convert utf8 bytes to a single u32 codepoint - next_utf8(): Convert first utf8 character in a string to a u32 codepoint and advance the passed string to the next unicode - Renamed m4_multiply -> m4_mul for consistency - Refactored os window to be DPI aware (scaled_width vs pixel_width) - in minimal example, renamed hammer_xform -> rect_xform
97 lines
2.8 KiB
C
97 lines
2.8 KiB
C
#if GFX_RENDERER == GFX_RENDERER_D3D11
|
|
#include <d3d11.h>
|
|
#include <dxgi.h>
|
|
#include <dxgi1_2.h>
|
|
#include <d3dcompiler.h>
|
|
#include <dxgidebug.h>
|
|
#include <d3dcommon.h>
|
|
typedef ID3D11ShaderResourceView * Gfx_Handle;
|
|
|
|
#elif GFX_RENDERER == GFX_RENDERER_VULKAN
|
|
#error "We only have a D3D11 renderer at the moment"
|
|
#elif GFX_RENDERER == GFX_RENDERER_METAL
|
|
#error "We only have a D3D11 renderer at the moment"
|
|
#else
|
|
#error "Unknown renderer GFX_RENDERER defined"
|
|
#endif
|
|
|
|
forward_global const Gfx_Handle GFX_INVALID_HANDLE;
|
|
#define QUAD_TYPE_REGULAR 0
|
|
#define QUAD_TYPE_TEXT 1
|
|
|
|
typedef enum Gfx_Filter_Mode {
|
|
GFX_FILTER_MODE_NEAREST,
|
|
GFX_FILTER_MODE_LINEAR,
|
|
} Gfx_Filter_Mode;
|
|
|
|
typedef struct Gfx_Image {
|
|
u32 width, height, channels;
|
|
Gfx_Handle gfx_handle;
|
|
Allocator allocator;
|
|
} Gfx_Image;
|
|
|
|
Gfx_Image *make_image(u32 width, u32 height, u32 channels, void *initial_data, Allocator allocator);
|
|
Gfx_Image *load_image_from_disk(string path, Allocator allocator);
|
|
void delete_image(Gfx_Image *image);
|
|
|
|
// Implemented per renderer
|
|
void gfx_init_image(Gfx_Image *image, void *data);
|
|
void gfx_set_image_data(Gfx_Image *image, u32 x, u32 y, u32 w, u32 h, void *data);
|
|
void gfx_deinit_image(Gfx_Image *image);
|
|
|
|
// initial_data can be null to leave image data uninitialized
|
|
Gfx_Image *make_image(u32 width, u32 height, u32 channels, void *initial_data, Allocator allocator) {
|
|
Gfx_Image *image = alloc(allocator, sizeof(Gfx_Image) + width*height*channels);
|
|
|
|
assert(channels > 0 && channels <= 4, "Only 1, 2, 3 or 4 channels allowed on images. Got %d", channels);
|
|
|
|
image->width = width;
|
|
image->height = height;
|
|
image->gfx_handle = GFX_INVALID_HANDLE; // This is handled in gfx
|
|
image->allocator = allocator;
|
|
image->channels = channels;
|
|
|
|
gfx_init_image(image, initial_data);
|
|
|
|
return image;
|
|
}
|
|
|
|
Gfx_Image *load_image_from_disk(string path, Allocator allocator) {
|
|
string png;
|
|
bool ok = os_read_entire_file(path, &png, allocator);
|
|
if (!ok) return 0;
|
|
|
|
Gfx_Image *image = alloc(allocator, sizeof(Gfx_Image));
|
|
|
|
int width, height, channels;
|
|
stbi_set_flip_vertically_on_load(1);
|
|
unsigned char* stb_data = stbi_load_from_memory(png.data, png.count, &width, &height, &channels, STBI_rgb_alpha);
|
|
|
|
if (!stb_data) {
|
|
dealloc(allocator, image);
|
|
dealloc_string(allocator, png);
|
|
return 0;
|
|
}
|
|
|
|
image->width = width;
|
|
image->height = height;
|
|
image->gfx_handle = GFX_INVALID_HANDLE; // This is handled in gfx
|
|
image->allocator = allocator;
|
|
image->channels = 4;
|
|
|
|
dealloc_string(allocator, png);
|
|
|
|
gfx_init_image(image, stb_data);
|
|
|
|
stbi_image_free(stb_data);
|
|
|
|
return image;
|
|
}
|
|
|
|
void delete_image(Gfx_Image *image) {
|
|
// Free the image data allocated by stb_image
|
|
image->width = 0;
|
|
image->height = 0;
|
|
gfx_deinit_image(image);
|
|
dealloc(image->allocator, image);
|
|
}
|