Remove bufferusage_uniform for now

It's not really implemented
This commit is contained in:
Alex Szpakowski
2021-03-26 21:43:24 -03:00
parent 2d2918a254
commit 9cc6be4ac7
3 changed files with 2 additions and 5 deletions
+2 -2
View File
@@ -189,7 +189,7 @@ Graphics::Graphics()
initCapabilities(); initCapabilities();
uniformBuffer = CreateStreamBuffer(device, BUFFERUSAGE_UNIFORM, 1024 * 1024 * 1); uniformBuffer = CreateStreamBuffer(device, BUFFERUSAGE_VERTEX, 1024 * 1024 * 1);
{ {
std::vector<Buffer::DataDeclaration> dataformat = { std::vector<Buffer::DataDeclaration> dataformat = {
@@ -717,7 +717,7 @@ void Graphics::applyShaderUniforms(id<MTLRenderCommandEncoder> renderEncoder, lo
{ {
size_t newsize = uniformBuffer->getSize() * 2; size_t newsize = uniformBuffer->getSize() * 2;
delete uniformBuffer; delete uniformBuffer;
uniformBuffer = CreateStreamBuffer(device, BUFFERUSAGE_UNIFORM, newsize); uniformBuffer = CreateStreamBuffer(device, BUFFERUSAGE_VERTEX, newsize);
uniformBufferData = {}; uniformBufferData = {};
uniformBufferOffset = 0; uniformBufferOffset = 0;
} }
-1
View File
@@ -619,7 +619,6 @@ GLenum OpenGL::getGLBufferType(BufferUsage usage)
{ {
case BUFFERUSAGE_VERTEX: return GL_ARRAY_BUFFER; case BUFFERUSAGE_VERTEX: return GL_ARRAY_BUFFER;
case BUFFERUSAGE_INDEX: return GL_ELEMENT_ARRAY_BUFFER; case BUFFERUSAGE_INDEX: return GL_ELEMENT_ARRAY_BUFFER;
case BUFFERUSAGE_UNIFORM: return GL_UNIFORM_BUFFER;
case BUFFERUSAGE_TEXEL: return GL_TEXTURE_BUFFER; case BUFFERUSAGE_TEXEL: return GL_TEXTURE_BUFFER;
case BUFFERUSAGE_SHADER_STORAGE: return GL_SHADER_STORAGE_BUFFER; case BUFFERUSAGE_SHADER_STORAGE: return GL_SHADER_STORAGE_BUFFER;
case BUFFERUSAGE_COPY_SOURCE: return GL_COPY_READ_BUFFER; case BUFFERUSAGE_COPY_SOURCE: return GL_COPY_READ_BUFFER;
-2
View File
@@ -58,7 +58,6 @@ enum BufferUsage
{ {
BUFFERUSAGE_VERTEX = 0, BUFFERUSAGE_VERTEX = 0,
BUFFERUSAGE_INDEX, BUFFERUSAGE_INDEX,
BUFFERUSAGE_UNIFORM,
BUFFERUSAGE_TEXEL, BUFFERUSAGE_TEXEL,
BUFFERUSAGE_SHADER_STORAGE, BUFFERUSAGE_SHADER_STORAGE,
BUFFERUSAGE_COPY_SOURCE, BUFFERUSAGE_COPY_SOURCE,
@@ -71,7 +70,6 @@ enum BufferUsageFlags
BUFFERUSAGEFLAG_NONE = 0, BUFFERUSAGEFLAG_NONE = 0,
BUFFERUSAGEFLAG_VERTEX = 1 << BUFFERUSAGE_VERTEX, BUFFERUSAGEFLAG_VERTEX = 1 << BUFFERUSAGE_VERTEX,
BUFFERUSAGEFLAG_INDEX = 1 << BUFFERUSAGE_INDEX, BUFFERUSAGEFLAG_INDEX = 1 << BUFFERUSAGE_INDEX,
BUFFERUSAGEFLAG_UNIFORM = 1 << BUFFERUSAGE_UNIFORM,
BUFFERUSAGEFLAG_TEXEL = 1 << BUFFERUSAGE_TEXEL, BUFFERUSAGEFLAG_TEXEL = 1 << BUFFERUSAGE_TEXEL,
BUFFERUSAGEFLAG_SHADER_STORAGE = 1 << BUFFERUSAGE_SHADER_STORAGE, BUFFERUSAGEFLAG_SHADER_STORAGE = 1 << BUFFERUSAGE_SHADER_STORAGE,
BUFFERUSAGEFLAG_COPY_SOURCE = 1 << BUFFERUSAGE_COPY_SOURCE, BUFFERUSAGEFLAG_COPY_SOURCE = 1 << BUFFERUSAGE_COPY_SOURCE,