encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-05-15 11:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for R16G16B16A16 ushort.

Browse Source 
Also implement both new formats in Vulkan.
This commit is contained in:
Stephen White 2018-04-10 10:16:57 -04:00 committed by Corentin Wallez
parent 0b1fbd9322
commit ee66f25c4f
6 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
next.json
View File

@ -1243,9 +1243,10 @@
{"value": 1, "name": "float r32 g32 b32"}, {"value": 1, "name": "float r32 g32 b32"},
{"value": 2, "name": "float r32 g32"}, {"value": 2, "name": "float r32 g32"},
{"value": 3, "name": "float r32"}, {"value": 3, "name": "float r32"},
{"value": 4, "name": "unorm r8 g8 b8 a8"}, {"value": 4, "name": "ushort r16 g16 b16 a16"},
{"value": 5, "name": "unorm r8 g8"}, {"value": 5, "name": "ushort r16 g16"},
{"value": 6, "name": "ushort r16 g16"} {"value": 6, "name": "unorm r8 g8 b8 a8"},
{"value": 7, "name": "unorm r8 g8"}
] ]
}, },
"void": { "void": {

9
src/backend/InputState.cpp
View File

@ -35,17 +35,17 @@ namespace backend {
uint32_t VertexFormatNumComponents(nxt::VertexFormat format) { uint32_t VertexFormatNumComponents(nxt::VertexFormat format) {
switch (format) { switch (format) {
case nxt::VertexFormat::FloatR32G32B32A32: case nxt::VertexFormat::FloatR32G32B32A32:
case nxt::VertexFormat::UshortR16G16B16A16:
case nxt::VertexFormat::UnormR8G8B8A8: case nxt::VertexFormat::UnormR8G8B8A8:
return 4; return 4;
case nxt::VertexFormat::FloatR32G32B32: case nxt::VertexFormat::FloatR32G32B32:
return 3; return 3;
case nxt::VertexFormat::FloatR32G32: case nxt::VertexFormat::FloatR32G32:
case nxt::VertexFormat::UshortR16G16:
case nxt::VertexFormat::UnormR8G8: case nxt::VertexFormat::UnormR8G8:
return 2; return 2;
case nxt::VertexFormat::FloatR32: case nxt::VertexFormat::FloatR32:
return 1; return 1;
case nxt::VertexFormat::UshortR16G16:
return 2;
default: default:
UNREACHABLE(); UNREACHABLE();
} }
@ -58,11 +58,12 @@ namespace backend {
case nxt::VertexFormat::FloatR32G32: case nxt::VertexFormat::FloatR32G32:
case nxt::VertexFormat::FloatR32: case nxt::VertexFormat::FloatR32:
return sizeof(float); return sizeof(float);
case nxt::VertexFormat::UshortR16G16B16A16:
case nxt::VertexFormat::UshortR16G16:
return sizeof(uint16_t);
case nxt::VertexFormat::UnormR8G8B8A8: case nxt::VertexFormat::UnormR8G8B8A8:
case nxt::VertexFormat::UnormR8G8: case nxt::VertexFormat::UnormR8G8:
return sizeof(uint8_t); return sizeof(uint8_t);
case nxt::VertexFormat::UshortR16G16:
return sizeof(unsigned short);
default: default:
UNREACHABLE(); UNREACHABLE();
} }

2
src/backend/d3d12/InputStateD3D12.cpp
View File

@ -28,6 +28,8 @@ namespace backend { namespace d3d12 {
return DXGI_FORMAT_R32G32_FLOAT; return DXGI_FORMAT_R32G32_FLOAT;
case nxt::VertexFormat::FloatR32: case nxt::VertexFormat::FloatR32:
return DXGI_FORMAT_R32_FLOAT; return DXGI_FORMAT_R32_FLOAT;
case nxt::VertexFormat::UshortR16G16B16A16:
return DXGI_FORMAT_R16G16B16A16_UINT;
case nxt::VertexFormat::UshortR16G16: case nxt::VertexFormat::UshortR16G16:
return DXGI_FORMAT_R16G16_UINT; return DXGI_FORMAT_R16G16_UINT;
case nxt::VertexFormat::UnormR8G8B8A8: case nxt::VertexFormat::UnormR8G8B8A8:

2
src/backend/metal/InputStateMTL.mm
View File

@ -30,6 +30,8 @@ namespace backend { namespace metal {
return MTLVertexFormatFloat2; return MTLVertexFormatFloat2;
case nxt::VertexFormat::FloatR32: case nxt::VertexFormat::FloatR32:
return MTLVertexFormatFloat; return MTLVertexFormatFloat;
case nxt::VertexFormat::UshortR16G16B16A16:
return MTLVertexFormatUShort4;
case nxt::VertexFormat::UshortR16G16: case nxt::VertexFormat::UshortR16G16:
return MTLVertexFormatUShort2; return MTLVertexFormatUShort2;
case nxt::VertexFormat::UnormR8G8B8A8: case nxt::VertexFormat::UnormR8G8B8A8:

9
src/backend/opengl/CommandBufferGL.cpp
View File

@ -49,6 +49,7 @@ namespace backend { namespace opengl {
case nxt::VertexFormat::FloatR32G32: case nxt::VertexFormat::FloatR32G32:
case nxt::VertexFormat::FloatR32: case nxt::VertexFormat::FloatR32:
return GL_FLOAT; return GL_FLOAT;
case nxt::VertexFormat::UshortR16G16B16A16:
case nxt::VertexFormat::UshortR16G16: case nxt::VertexFormat::UshortR16G16:
return GL_UNSIGNED_SHORT; return GL_UNSIGNED_SHORT;
case nxt::VertexFormat::UnormR8G8B8A8: case nxt::VertexFormat::UnormR8G8B8A8:
@ -61,17 +62,11 @@ namespace backend { namespace opengl {
GLboolean VertexFormatIsNormalized(nxt::VertexFormat format) { GLboolean VertexFormatIsNormalized(nxt::VertexFormat format) {
switch (format) { switch (format) {
case nxt::VertexFormat::FloatR32G32B32A32:
case nxt::VertexFormat::FloatR32G32B32:
case nxt::VertexFormat::FloatR32G32:
case nxt::VertexFormat::FloatR32:
case nxt::VertexFormat::UshortR16G16:
return GL_FALSE;
case nxt::VertexFormat::UnormR8G8B8A8: case nxt::VertexFormat::UnormR8G8B8A8:
case nxt::VertexFormat::UnormR8G8: case nxt::VertexFormat::UnormR8G8:
return GL_TRUE; return GL_TRUE;
default: default:
UNREACHABLE(); return GL_FALSE;
} }
} }

4
src/backend/vulkan/InputStateVk.cpp
View File

@ -41,6 +41,10 @@ namespace backend { namespace vulkan {
return VK_FORMAT_R32G32_SFLOAT; return VK_FORMAT_R32G32_SFLOAT;
case nxt::VertexFormat::FloatR32: case nxt::VertexFormat::FloatR32:
return VK_FORMAT_R32_SFLOAT; return VK_FORMAT_R32_SFLOAT;
case nxt::VertexFormat::UshortR16G16B16A16:
return VK_FORMAT_R16G16B16A16_UINT;
case nxt::VertexFormat::UshortR16G16:
return VK_FORMAT_R16G16_UINT;
case nxt::VertexFormat::UnormR8G8B8A8: case nxt::VertexFormat::UnormR8G8B8A8:
return VK_FORMAT_R8G8B8A8_UNORM; return VK_FORMAT_R8G8B8A8_UNORM;
case nxt::VertexFormat::UnormR8G8: case nxt::VertexFormat::UnormR8G8: