mirror of
https://github.com/encounter/aurora.git
synced 2025-07-04 20:26:07 +00:00
Minor fixes with indexed draw calls
This commit is contained in:
parent
fee77b3d25
commit
788c65592f
@ -180,6 +180,8 @@ static inline wgpu::PrimitiveState to_primitive_state(GXPrimitive gx_prim, GXCul
|
|||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
.topology = primitive,
|
.topology = primitive,
|
||||||
|
.stripIndexFormat = gx_prim == GX_TRIANGLESTRIP || gx_prim == GX_LINESTRIP ? wgpu::IndexFormat::Uint16
|
||||||
|
: wgpu::IndexFormat::Undefined,
|
||||||
.frontFace = wgpu::FrontFace::CW,
|
.frontFace = wgpu::FrontFace::CW,
|
||||||
.cullMode = cullMode,
|
.cullMode = cullMode,
|
||||||
};
|
};
|
||||||
@ -251,11 +253,11 @@ void populate_pipeline_config(PipelineConfig& config, GXPrimitive primitive, GXV
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// Map attribute to its own storage
|
// Map attribute to its own storage
|
||||||
config.shaderConfig.attrMapping[i] = StorageConfig {
|
config.shaderConfig.attrMapping[i] = StorageConfig{
|
||||||
.attr = static_cast<GXAttr>(i),
|
.attr = static_cast<GXAttr>(i),
|
||||||
.cnt = vtxFmt.attrs[i].cnt,
|
.cnt = vtxFmt.attrs[i].cnt,
|
||||||
.compType = vtxFmt.attrs[i].type,
|
.compType = vtxFmt.attrs[i].type,
|
||||||
.frac = vtxFmt.attrs[i].frac,
|
.frac = vtxFmt.attrs[i].frac,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
config.shaderConfig.tevSwapTable = g_gxState.tevSwapTable;
|
config.shaderConfig.tevSwapTable = g_gxState.tevSwapTable;
|
||||||
|
@ -391,6 +391,20 @@ bool initialize(AuroraBackend auroraBackend) {
|
|||||||
: supportedLimits.maxTextureDimension2D,
|
: supportedLimits.maxTextureDimension2D,
|
||||||
.maxTextureDimension3D = supportedLimits.maxTextureDimension3D == 0 ? WGPU_LIMIT_U32_UNDEFINED
|
.maxTextureDimension3D = supportedLimits.maxTextureDimension3D == 0 ? WGPU_LIMIT_U32_UNDEFINED
|
||||||
: supportedLimits.maxTextureDimension3D,
|
: supportedLimits.maxTextureDimension3D,
|
||||||
|
.maxTextureArrayLayers = supportedLimits.maxTextureArrayLayers == 0 ? WGPU_LIMIT_U32_UNDEFINED
|
||||||
|
: supportedLimits.maxTextureArrayLayers,
|
||||||
|
.maxBindGroupsPlusVertexBuffers = supportedLimits.maxBindGroupsPlusVertexBuffers == 0
|
||||||
|
? WGPU_LIMIT_U32_UNDEFINED
|
||||||
|
: supportedLimits.maxBindGroupsPlusVertexBuffers,
|
||||||
|
.maxBindingsPerBindGroup = supportedLimits.maxBindGroupsPlusVertexBuffers == 0
|
||||||
|
? WGPU_LIMIT_U32_UNDEFINED
|
||||||
|
: supportedLimits.maxBindGroupsPlusVertexBuffers,
|
||||||
|
.maxDynamicUniformBuffersPerPipelineLayout = supportedLimits.maxDynamicUniformBuffersPerPipelineLayout == 0
|
||||||
|
? WGPU_LIMIT_U32_UNDEFINED
|
||||||
|
: supportedLimits.maxDynamicUniformBuffersPerPipelineLayout,
|
||||||
|
.maxDynamicStorageBuffersPerPipelineLayout = supportedLimits.maxDynamicStorageBuffersPerPipelineLayout == 0
|
||||||
|
? WGPU_LIMIT_U32_UNDEFINED
|
||||||
|
: supportedLimits.maxDynamicStorageBuffersPerPipelineLayout,
|
||||||
.minUniformBufferOffsetAlignment = supportedLimits.minUniformBufferOffsetAlignment == 0
|
.minUniformBufferOffsetAlignment = supportedLimits.minUniformBufferOffsetAlignment == 0
|
||||||
? WGPU_LIMIT_U32_UNDEFINED
|
? WGPU_LIMIT_U32_UNDEFINED
|
||||||
: supportedLimits.minUniformBufferOffsetAlignment,
|
: supportedLimits.minUniformBufferOffsetAlignment,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user