AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-08 21:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add True and False tests for bitwise enums

Browse Source
This commit is contained in:
Jack Andersen
2019-04-02 18:28:39 -10:00
parent af4b1a4521
commit c1d3d040bf
9 changed files with 57 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/graphicsdev/GL.cpp
View File

@@ -1123,7 +1123,7 @@ struct GLCommandQueue : IGraphicsCommandQueue {
auto pipeline = fmt->m_pipeline.cast<GLShaderPipeline>();
for (size_t i = 0; i < pipeline->m_elements.size(); ++i) {
const VertexElementDescriptor& desc = pipeline->m_elements[i];
if ((desc.semantic & VertexSemantic::Instanced) != VertexSemantic::None)
if (True(desc.semantic & VertexSemantic::Instanced))
instStride += SEMANTIC_SIZE_TABLE[int(desc.semantic & VertexSemantic::SemanticMask)];
else
stride += SEMANTIC_SIZE_TABLE[int(desc.semantic & VertexSemantic::SemanticMask)];
@@ -1137,7 +1137,7 @@ struct GLCommandQueue : IGraphicsCommandQueue {
IGraphicsBuffer* lastEBO = nullptr;
for (size_t i = 0; i < pipeline->m_elements.size(); ++i) {
const VertexElementDescriptor& desc = pipeline->m_elements[i];
IGraphicsBuffer* vbo = (desc.semantic & VertexSemantic::Instanced) != VertexSemantic::None
IGraphicsBuffer* vbo = True(desc.semantic & VertexSemantic::Instanced)
? fmt->m_instVbo.get()
: fmt->m_vbo.get();
IGraphicsBuffer* ebo = fmt->m_ibo.get();
@@ -1157,7 +1157,7 @@ struct GLCommandQueue : IGraphicsCommandQueue {
}
glEnableVertexAttribArray(i);
int maskedSem = int(desc.semantic & VertexSemantic::SemanticMask);
if ((desc.semantic & VertexSemantic::Instanced) != VertexSemantic::None) {
if (True(desc.semantic & VertexSemantic::Instanced)) {
glVertexAttribPointer(i, SEMANTIC_COUNT_TABLE[maskedSem], SEMANTIC_TYPE_TABLE[maskedSem], GL_TRUE, instStride,
(void*)instOffset);
glVertexAttribDivisor(i, 1);

2
lib/graphicsdev/Vulkan.cpp
View File

@@ -1944,7 +1944,7 @@ struct VulkanVertexFormat {
int semantic = int(elemin->semantic & boo::VertexSemantic::SemanticMask);
attribute.location = i;
attribute.format = SEMANTIC_TYPE_TABLE[semantic];
if ((elemin->semantic & boo::VertexSemantic::Instanced) != boo::VertexSemantic::None) {
if (True(elemin->semantic & boo::VertexSemantic::Instanced)) {
attribute.binding = 1;
attribute.offset = m_instStride;
m_instStride += SEMANTIC_SIZE_TABLE[semantic];