Commit 2b083ac4532e478d75eae2d7a3e7f0b03b10a723
2023-12-07T00:18:54
wip win11
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274
diff --git a/libc3/window/cairo/win32/demo/configure b/libc3/window/cairo/win32/demo/configure
index 0d279a2..2bb475e 100644
--- a/libc3/window/cairo/win32/demo/configure
+++ b/libc3/window/cairo/win32/demo/configure
@@ -48,27 +48,27 @@ CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic"
CPPFLAGS="-I../../../../../libffi/include -I../../../../.. $CPPFLAGS"
config_asan
config_gnu
+pkg_config libbsd-overlay
pkg_config cairo
pkg_config cairo-win32
-pkg_config libbsd-overlay
LIBS="$LIBS"
# Asan config
CFLAGS_ASAN="$CFLAGS -fsanitize=address -O1 -fno-omit-frame-pointer -g"
LDFLAGS_ASAN="$LDFLAGS"
-LOCAL_LIBS_ASAN="../libc3_window_cairo_win32_asan.la"
+LOCAL_LIBS_ASAN="../../demo/libc3_window_cairo_demo_asan.la ../libc3_window_cairo_win32_asan.la"
LIBS_ASAN="$LOCAL_LIBS_ASAN $LIBS"
# Coverage config
CFLAGS_COV="$CFLAGS -ftest-coverage -fprofile-arcs -fprofile-generate"
LDFLAGS_COV="$LDFLAGS --coverage"
-LOCAL_LIBS_COV="../libc3_window_cairo_win32_cov.la"
+LOCAL_LIBS_COV="../../demo/libc3_window_cairo_demo_cov.la ../libc3_window_cairo_win32_cov.la"
LIBS_COV="$LOCAL_LIBS_COV $LIBS"
# Debug config
CFLAGS_DEBUG="$CFLAGS -DDEBUG -O0 -g"
LDFLAGS_DEBUG="$LDFLAGS"
-LOCAL_LIBS_DEBUG="../libc3_window_cairo_win32_debug.la"
+LOCAL_LIBS_DEBUG="../../demo/libc3_window_cairo_demo_debug.la ../libc3_window_cairo_win32_debug.la"
LIBS_DEBUG="$LOCAL_LIBS_DEBUG $LIBS"
# Main config
@@ -77,7 +77,7 @@ if [ "x$ENV_CFLAGS" = "x" ]; then
CFLAGS="$CFLAGS $DEFAULT_CFLAGS"
fi
CFLAGS="$CFLAGS -DNDEBUG"
-LOCAL_LIBS="../libc3_window_cairo_win32.la"
+LOCAL_LIBS="../../demo/libc3_window_cairo_demo.la ../libc3_window_cairo_win32.la"
LIBS="$LOCAL_LIBS $LIBS"
echo "HAVE_ASAN = $HAVE_ASAN" >> ${CONFIG_MK}
diff --git a/libc3/window/cairo/win32/demo/window_cairo_win32_demo.c b/libc3/window/cairo/win32/demo/window_cairo_win32_demo.c
index 110cade..9e8ad13 100644
--- a/libc3/window/cairo/win32/demo/window_cairo_win32_demo.c
+++ b/libc3/window/cairo/win32/demo/window_cairo_win32_demo.c
@@ -26,12 +26,12 @@ int main (int argc, char **argv)
c3_window_cairo_init();
window_cairo_init(&window, 0, 0, 800, 600,
"C3.Window.Cairo.Win32 demo",
- LIBC3_WINDOW_CAIRO_DEMO_SEQUENCE_COUNT);
- window.button = c3_window_cairo_demo_button;
- window.key = c3_window_cairo_demo_key;
- window.load = c3_window_cairo_demo_load;
- window.render = c3_window_cairo_demo_render;
- window.resize = c3_window_cairo_demo_resize;
+ WINDOW_CAIRO_DEMO_SEQUENCE_COUNT);
+ window.button = window_cairo_demo_button;
+ window.key = window_cairo_demo_key;
+ window.load = window_cairo_demo_load;
+ window.render = window_cairo_demo_render;
+ window.resize = window_cairo_demo_resize;
if (! window_cairo_win32_run(&window))
return g_c3_exit_code;
c3_window_cairo_clean();
diff --git a/libc3/window/cairo/win32/window_cairo_win32.c b/libc3/window/cairo/win32/window_cairo_win32.c
index 93eadd5..ca84461 100644
--- a/libc3/window/cairo/win32/window_cairo_win32.c
+++ b/libc3/window/cairo/win32/window_cairo_win32.c
@@ -10,6 +10,7 @@
* AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
* THIS SOFTWARE.
*/
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <xkbcommon/xkbcommon.h>
diff --git a/libc3/window/sdl2/sdl2_sprite.c b/libc3/window/sdl2/sdl2_sprite.c
index b1aeb10..d676800 100644
--- a/libc3/window/sdl2/sdl2_sprite.c
+++ b/libc3/window/sdl2/sdl2_sprite.c
@@ -88,21 +88,23 @@ s_sdl2_sprite * sdl2_sprite_init (s_sdl2_sprite *sprite,
uw dim_x, uw dim_y,
uw frame_count)
{
- u8 components;
u8 *data;
FILE *fp;
GLenum gl_format;
GLint gl_internal_format;
GLenum gl_type;
uw i;
+ s32 png_bit_depth;
+ s32 png_color_type;
+ u8 png_components;
+ png_bytep png_data;
+ u32 png_h;
u8 png_header[8]; // maximum size is 8
png_infop png_info;
+ uw png_pixel_size;
png_structp png_read;
png_bytep *png_row;
u32 png_w;
- u32 png_h;
- s32 png_bit_depth;
- s32 png_color_type;
u8 *sprite_data;
uw sprite_stride;
uw x;
@@ -142,10 +144,10 @@ s_sdl2_sprite * sdl2_sprite_init (s_sdl2_sprite *sprite,
return NULL;
}
png_read = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL,
- NULL);
+ NULL);
if (! png_read) {
warn("sdl2_sprite_init: %s: png_create_read_struct",
- sprite->real_path.ptr.ps8);
+ sprite->real_path.ptr.ps8);
fclose(fp);
str_clean(&sprite->path);
str_clean(&sprite->real_path);
@@ -154,7 +156,7 @@ s_sdl2_sprite * sdl2_sprite_init (s_sdl2_sprite *sprite,
png_info = png_create_info_struct(png_read);
if (! png_info) {
warn("sdl2_sprite_init: %s: png_create_info_struct",
- sprite->real_path.ptr.ps8);
+ sprite->real_path.ptr.ps8);
png_destroy_read_struct(&png_read, NULL, NULL);
fclose(fp);
str_clean(&sprite->path);
@@ -170,24 +172,54 @@ s_sdl2_sprite * sdl2_sprite_init (s_sdl2_sprite *sprite,
}
png_init_io(png_read, fp);
png_set_sig_bytes(png_read, sizeof(png_header));
- png_read_png(png_read, png_info,
- PNG_TRANSFORM_PACKING, NULL);
+ png_read_info(png_read, png_info);
png_get_IHDR(png_read, png_info, &png_w, &png_h,
- &png_bit_depth, &png_color_type,
- NULL, NULL, NULL);
+ &png_bit_depth, &png_color_type,
+ NULL, NULL, NULL);
if (png_color_type == PNG_COLOR_TYPE_PALETTE) {
warnx("sdl2_sprite_init: %s: PNG_COLOR_TYPE_PALETTE",
- sprite->real_path.ptr.ps8);
+ sprite->real_path.ptr.ps8);
png_destroy_read_struct(&png_read, &png_info, NULL);
fclose(fp);
str_clean(&sprite->path);
str_clean(&sprite->real_path);
return NULL;
}
- png_row = png_get_rows(png_read, png_info);
+ if (! png_info_to_gl_info(png_color_type, png_bit_depth, &gl_format,
+ &gl_internal_format, &gl_type,
+ &png_components)) {
+ if (! gl_format || ! png_components)
+ warnx("sdl2_sprite_init: %s: unknown PNG color type: %d",
+ sprite->real_path.ptr.ps8, png_color_type);
+ if (! gl_internal_format)
+ warnx("sdl2_sprite_init: %s: unknown OpenGL internal format",
+ sprite->real_path.ptr.ps8);
+ if (! gl_type)
+ warnx("sdl2_sprite_init: %s: unknown OpenGL type",
+ sprite->real_path.ptr.ps8);
+ png_destroy_read_struct(&png_read, &png_info, NULL);
+ fclose(fp);
+ str_clean(&sprite->path);
+ str_clean(&sprite->real_path);
+ return NULL;
+ }
+ png_pixel_size = (png_bit_depth / 8) * png_components;
+ if (! png_pixel_size)
+ png_error(png_read, "unknown png pixel size");
+ if (png_h > PNG_SIZE_MAX / (png_w * png_pixel_size))
+ png_error(png_read, "image_data buffer would be too large");
+ png_data = png_malloc(png_read, png_h * png_w * png_pixel_size);
+ png_row = png_malloc(png_read, png_h * sizeof(png_bytep));
+ i = 0;
+ while (i < png_h) {
+ png_row[i] = png_data + i * png_w * png_pixel_size;
+ i++;
+ }
+ png_set_rows(png_read, png_info, png_row);
+ png_read_png(png_read, png_info, PNG_TRANSFORM_PACKING, NULL);
if (! png_row) {
warnx("sdl2_sprite_init: %s: png_get_rows => NULL",
- sprite->real_path.ptr.ps8);
+ sprite->real_path.ptr.ps8);
png_destroy_read_struct(&png_read, &png_info, NULL);
fclose(fp);
str_clean(&sprite->path);
@@ -214,29 +246,10 @@ s_sdl2_sprite * sdl2_sprite_init (s_sdl2_sprite *sprite,
GLenum gl_error = glGetError();
if (gl_error != GL_NO_ERROR) {
warnx("sdl2_sprite_init: %s: glGenTextures: %s\n",
- sprite->real_path.ptr.ps8, gluErrorString(gl_error));
- return NULL;
- }
- if (! png_info_to_gl_info(png_color_type, png_bit_depth, &gl_format,
- &gl_internal_format, &gl_type,
- &components)) {
- if (! gl_format)
- warnx("sdl2_sprite_init: %s: unknown PNG color type: %d",
- sprite->real_path.ptr.ps8, png_color_type);
- if (! gl_internal_format)
- warnx("sdl2_sprite_init: %s: unknown OpenGL internal format",
- sprite->real_path.ptr.ps8);
- if (! gl_type)
- warnx("sdl2_sprite_init: %s: unknown OpenGL type",
- sprite->real_path.ptr.ps8);
- free(sprite->texture);
- png_destroy_read_struct(&png_read, &png_info, NULL);
- fclose(fp);
- str_clean(&sprite->path);
- str_clean(&sprite->real_path);
+ sprite->real_path.ptr.ps8, gluErrorString(gl_error));
return NULL;
}
- sprite_stride = sprite->w * (png_bit_depth / 8) * components;
+ sprite_stride = sprite->w * png_pixel_size;
data = malloc(sprite->h * sprite_stride);
if (! data) {
warn("sdl2_sprite_init: %s", sprite->real_path.ptr.ps8);
@@ -255,11 +268,11 @@ s_sdl2_sprite * sdl2_sprite_init (s_sdl2_sprite *sprite,
sprite_data = data + sprite_stride * sprite->h;
v = 0;
while (v < sprite->h) {
- sprite_data -= sprite_stride;
- memcpy(sprite_data,
- png_row[y * sprite->h + v] + x * sprite_stride,
- sprite_stride);
- v++;
+ sprite_data -= sprite_stride;
+ memcpy(sprite_data,
+ png_row[y * sprite->h + v] + x * sprite_stride,
+ sprite_stride);
+ v++;
}
glBindTexture(GL_TEXTURE_2D, sprite->texture[i]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
@@ -267,13 +280,13 @@ s_sdl2_sprite * sdl2_sprite_init (s_sdl2_sprite *sprite,
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, gl_format, sprite->w, sprite->h,
- 0, gl_format, gl_type, data);
+ 0, gl_format, gl_type, data);
//glGenerateMipmap(GL_TEXTURE_2D);
gl_error = glGetError();
if (gl_error != GL_NO_ERROR) {
- warnx("sdl2_sprite_init: %s: glTexImage2D: %s\n",
- sprite->real_path.ptr.ps8, gluErrorString(gl_error));
- return NULL;
+ warnx("sdl2_sprite_init: %s: glTexImage2D: %s\n",
+ sprite->real_path.ptr.ps8, gluErrorString(gl_error));
+ return NULL;
}
i++;
x++;
@@ -281,8 +294,8 @@ s_sdl2_sprite * sdl2_sprite_init (s_sdl2_sprite *sprite,
y++;
}
free(data);
- png_destroy_read_struct(&png_read, &png_info, NULL);
- fclose(fp);
+ free(png_data);
+ free(png_row);
return sprite;
}