summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/asset_packer.cc6
-rw-r--r--tools/cnn_test.cc34
-rw-r--r--tools/shadertoy/template.cc2
3 files changed, 21 insertions, 21 deletions
diff --git a/tools/asset_packer.cc b/tools/asset_packer.cc
index fdecb58..7e186b6 100644
--- a/tools/asset_packer.cc
+++ b/tools/asset_packer.cc
@@ -307,12 +307,12 @@ static bool ProcessMeshFile(const std::string& full_path,
buffer->resize(sizeof(uint32_t) + final_vertices.size() * sizeof(Vertex) +
sizeof(uint32_t) + final_indices.size() * sizeof(uint32_t));
uint8_t* out_ptr = buffer->data();
- *reinterpret_cast<uint32_t*>(out_ptr) = (uint32_t)final_vertices.size();
+ *(uint32_t*)(out_ptr) = (uint32_t)final_vertices.size();
out_ptr += sizeof(uint32_t);
std::memcpy(out_ptr, final_vertices.data(),
final_vertices.size() * sizeof(Vertex));
out_ptr += final_vertices.size() * sizeof(Vertex);
- *reinterpret_cast<uint32_t*>(out_ptr) = (uint32_t)final_indices.size();
+ *(uint32_t*)(out_ptr) = (uint32_t)final_indices.size();
out_ptr += sizeof(uint32_t);
std::memcpy(out_ptr, final_indices.data(),
final_indices.size() * sizeof(uint32_t));
@@ -337,7 +337,7 @@ static bool ProcessImageFile(const std::string& full_path,
// Format: [Width(4)][Height(4)][Pixels...]
buffer->resize(sizeof(uint32_t) * 2 + w * h * 4);
- uint32_t* header = reinterpret_cast<uint32_t*>(buffer->data());
+ uint32_t* header = (uint32_t*)(buffer->data());
header[0] = (uint32_t)w;
header[1] = (uint32_t)h;
std::memcpy(buffer->data() + sizeof(uint32_t) * 2, img_data, w * h * 4);
diff --git a/tools/cnn_test.cc b/tools/cnn_test.cc
index 25a1285..5694a62 100644
--- a/tools/cnn_test.cc
+++ b/tools/cnn_test.cc
@@ -176,7 +176,7 @@ static WGPUTexture load_texture(WGPUDevice device, WGPUQueue queue,
.usage = WGPUTextureUsage_TextureBinding | WGPUTextureUsage_CopyDst |
WGPUTextureUsage_RenderAttachment,
.dimension = WGPUTextureDimension_2D,
- .size = {static_cast<uint32_t>(width), static_cast<uint32_t>(height), 1},
+ .size = {(uint32_t)(width), (uint32_t)(height), 1},
.format = WGPUTextureFormat_BGRA8Unorm,
.mipLevelCount = 1,
.sampleCount = 1,
@@ -200,10 +200,10 @@ static WGPUTexture load_texture(WGPUDevice device, WGPUQueue queue,
// Upload to GPU
const WGPUTexelCopyTextureInfo dst = {.texture = texture, .mipLevel = 0};
const WGPUTexelCopyBufferLayout layout = {
- .bytesPerRow = static_cast<uint32_t>(width * 4),
- .rowsPerImage = static_cast<uint32_t>(height)};
- const WGPUExtent3D size = {static_cast<uint32_t>(width),
- static_cast<uint32_t>(height), 1};
+ .bytesPerRow = (uint32_t)(width * 4),
+ .rowsPerImage = (uint32_t)(height)};
+ const WGPUExtent3D size = {(uint32_t)(width),
+ (uint32_t)(height), 1};
wgpuQueueWriteTexture(queue, &dst, bgra_data.data(), bgra_data.size(),
&layout, &size);
@@ -238,7 +238,7 @@ static WGPUTexture load_depth_from_alpha(WGPUDevice device, WGPUQueue queue,
const WGPUTextureDescriptor depth_desc = {
.usage = WGPUTextureUsage_TextureBinding | WGPUTextureUsage_CopyDst,
.dimension = WGPUTextureDimension_2D,
- .size = {static_cast<uint32_t>(width), static_cast<uint32_t>(height), 1},
+ .size = {(uint32_t)(width), (uint32_t)(height), 1},
.format = WGPUTextureFormat_R32Float,
.mipLevelCount = 1,
.sampleCount = 1,
@@ -253,10 +253,10 @@ static WGPUTexture load_depth_from_alpha(WGPUDevice device, WGPUQueue queue,
const WGPUTexelCopyTextureInfo dst = {.texture = depth_texture,
.mipLevel = 0};
const WGPUTexelCopyBufferLayout layout = {
- .bytesPerRow = static_cast<uint32_t>(width * sizeof(float)),
- .rowsPerImage = static_cast<uint32_t>(height)};
- const WGPUExtent3D size = {static_cast<uint32_t>(width),
- static_cast<uint32_t>(height), 1};
+ .bytesPerRow = (uint32_t)(width * sizeof(float)),
+ .rowsPerImage = (uint32_t)(height)};
+ const WGPUExtent3D size = {(uint32_t)(width),
+ (uint32_t)(height), 1};
wgpuQueueWriteTexture(queue, &dst, depth_data.data(),
depth_data.size() * sizeof(float), &layout, &size);
@@ -474,8 +474,8 @@ readback_rgba32uint_to_bgra8(WGPUDevice device, WGPUQueue queue,
dst.layout.bytesPerRow = padded_bytes_per_row;
dst.layout.rowsPerImage = height;
- WGPUExtent3D copy_size = {static_cast<uint32_t>(width),
- static_cast<uint32_t>(height), 1};
+ WGPUExtent3D copy_size = {(uint32_t)(width),
+ (uint32_t)(height), 1};
wgpuCommandEncoderCopyTextureToBuffer(encoder, &src, &dst, &copy_size);
@@ -575,7 +575,7 @@ readback_rgba32uint_to_bgra8(WGPUDevice device, WGPUQueue queue,
return 0;
if (v >= 1.0f)
return 255;
- return static_cast<uint8_t>(v * 255.0f + 0.5f);
+ return (uint8_t)(v * 255.0f + 0.5f);
};
result[(y * width + x) * 4 + 0] = clamp_u8(b);
@@ -743,7 +743,7 @@ static bool process_cnn_v2(WGPUDevice device, WGPUQueue queue,
.usage = WGPUTextureUsage_StorageBinding |
WGPUTextureUsage_TextureBinding | WGPUTextureUsage_CopySrc,
.dimension = WGPUTextureDimension_2D,
- .size = {static_cast<uint32_t>(width), static_cast<uint32_t>(height), 1},
+ .size = {(uint32_t)(width), (uint32_t)(height), 1},
.format = WGPUTextureFormat_RGBA32Uint,
.mipLevelCount = 1,
.sampleCount = 1,
@@ -1350,7 +1350,7 @@ int main(int argc, char** argv) {
.usage = WGPUTextureUsage_TextureBinding |
WGPUTextureUsage_RenderAttachment | WGPUTextureUsage_CopySrc,
.dimension = WGPUTextureDimension_2D,
- .size = {static_cast<uint32_t>(width), static_cast<uint32_t>(height), 1},
+ .size = {(uint32_t)(width), (uint32_t)(height), 1},
.format = WGPUTextureFormat_RGBA16Float,
.mipLevelCount = 1,
.sampleCount = 1,
@@ -1385,8 +1385,8 @@ int main(int argc, char** argv) {
// Update uniforms
UniformsSequenceParams common_u = {
- .resolution = {static_cast<float>(width), static_cast<float>(height)},
- .aspect_ratio = static_cast<float>(width) / static_cast<float>(height),
+ .resolution = {(float)(width), (float)(height)},
+ .aspect_ratio = (float)(width) / (float)(height),
.time = 0.0f,
.beat_time = 0.0f,
.beat_phase = 0.0f,
diff --git a/tools/shadertoy/template.cc b/tools/shadertoy/template.cc
index 56b4ab5..fdc4f70 100644
--- a/tools/shadertoy/template.cc
+++ b/tools/shadertoy/template.cc
@@ -99,7 +99,7 @@ void ShaderToyEffect::init(MainSequence* demo) {
void ShaderToyEffect::render(WGPURenderPassEncoder pass, float time, float beat,
float intensity, float aspect_ratio) {
const UniformsSequenceParams uniforms = {
- .resolution = {static_cast<float>(width_), static_cast<float>(height_)},
+ .resolution = {(float)(width_), (float)(height_)},
.aspect_ratio = aspect_ratio,
.time = time,
.beat = beat,