diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2019-05-14 17:31:04 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2019-05-14 17:31:09 +0300 |
commit | 3db428406f69358f7bc81e8f757f733338236a29 (patch) | |
tree | 33d948bd875757f126255ed1afe26e4726b1b10e /source/blender/gpu | |
parent | af088c26409503a53fdc0182038faa6574cfc29f (diff) |
Fix T64601 Error division by zero in GPUVertexFormat
The windows compiler use signed int by default for enums so that broke
the bit count I carefully did. Forcing uint fixes it.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/GPU_vertex_buffer.h | 2 | ||||
-rw-r--r-- | source/blender/gpu/GPU_vertex_format.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h index 58d48a18fc5..3e178e193dc 100644 --- a/source/blender/gpu/GPU_vertex_buffer.h +++ b/source/blender/gpu/GPU_vertex_buffer.h @@ -55,7 +55,7 @@ typedef struct GPUVertBuf { /** 0 indicates not yet allocated. */ uint32_t vbo_id; /** Usage hint for GL optimisation. */ - GPUUsageType usage : 2; + uint usage : 2; /** Data has been touched and need to be reuploaded to GPU. */ uint dirty : 1; unsigned char *data; /* NULL indicates data in VRAM (unmapped) */ diff --git a/source/blender/gpu/GPU_vertex_format.h b/source/blender/gpu/GPU_vertex_format.h index b0ff7c1820f..43eec55bca2 100644 --- a/source/blender/gpu/GPU_vertex_format.h +++ b/source/blender/gpu/GPU_vertex_format.h @@ -56,8 +56,8 @@ typedef enum { } GPUVertFetchMode; typedef struct GPUVertAttr { - GPUVertFetchMode fetch_mode : 2; - GPUVertCompType comp_type : 3; + uint fetch_mode : 2; + uint comp_type : 3; /* 1 to 4 or 8 or 12 or 16 */ uint comp_len : 5; /* size in bytes, 1 to 64 */ |