summaryrefslogtreecommitdiffstatsci
diff options
context:
space:
mode:
authorJean-Philippe Bruyère <jp_bruyere@hotmail.com>2021-12-21 08:27:31 +0100
committerJean-Philippe Bruyère <jp_bruyere@hotmail.com>2021-12-21 08:27:31 +0100
commit311b54d330ad4e5f61dcecb4e3d4427229d65f88 (patch)
tree2ef6f7a3e5cd05dbfce1b473fec87bc4cdc97166
parentd41c995563e524c3946988cda2703a225f3df593 (diff)
swapchain color to unorm
-rw-r--r--src/vkvg_surface.c2
-rw-r--r--tests/common/vkengine.c2
-rw-r--r--tests/curve.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/vkvg_surface.c b/src/vkvg_surface.c
index b183a9a..04325bc 100644
--- a/src/vkvg_surface.c
+++ b/src/vkvg_surface.c
@@ -318,7 +318,7 @@ void vkvg_surface_write_to_memory (VkvgSurface surf, unsigned char* const bitmap
uint32_t dest_stride = surf->width * 4;
char* img = vkh_image_map (stagImg);
- char* row = bitmap;
+ char* row = (char*)bitmap;
for (uint32_t y = 0; y < surf->height; y++) {
memcpy(row, img, dest_stride);
row += dest_stride;
diff --git a/tests/common/vkengine.c b/tests/common/vkengine.c
index 90884f1..a442c1f 100644
--- a/tests/common/vkengine.c
+++ b/tests/common/vkengine.c
@@ -218,7 +218,7 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR
e->dev = vkh_device_create(e->app, pi, &device_info);
e->renderer = vkh_presenter_create
- (e->dev, (uint32_t) pi->pQueue, surf, width, height, VK_FORMAT_B8G8R8A8_SRGB, presentMode);
+ (e->dev, (uint32_t) pi->pQueue, surf, width, height, VK_FORMAT_B8G8R8A8_UNORM, presentMode);
vkh_app_free_phyinfos (phyCount, phys);
diff --git a/tests/curve.c b/tests/curve.c
index b944c71..6ad3d26 100644
--- a/tests/curve.c
+++ b/tests/curve.c
@@ -118,8 +118,8 @@ void random_curves_stroke () {
for (uint32_t i=0; i<test_size; i++) {
randomize_color(ctx);
- float x1 = w*rand()/RAND_MAX;
- float y1 = h*rand()/RAND_MAX;
+ float x1 = rndf() * w;
+ float y1 = rndf() * h;
vkvg_move_to (ctx, x1, y1);
draw_random_curve(ctx);
@@ -137,8 +137,8 @@ void _long_curv () {
vkvg_set_fill_rule(ctx, fill_rule);
randomize_color(ctx);
- float x1 = w*rand()/RAND_MAX;
- float y1 = h*rand()/RAND_MAX;
+ float x1 = rndf() * w;
+ float y1 = rndf() * h;
vkvg_move_to (ctx, x1, y1);
for (uint32_t i=0; i<test_size; i++) {