From 8356e8a99fbb4eda182e838e202c11530ed81403 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 18 Mar 2019 09:35:22 -0700 Subject: Renamed USAGE_CPU_ACCESSIBLE to USAGE_STAGING --- Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.h | 8 ++++---- Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Graphics/GraphicsEngineOpenGL') diff --git a/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.h b/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.h index f9cdb0c5..d7e7b55c 100644 --- a/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.h +++ b/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.h @@ -91,10 +91,10 @@ inline GLenum UsageToGLUsage(USAGE Usage) // http://www.informit.com/articles/article.aspx?p=2033340&seqNum=2 switch(Usage) { - case USAGE_STATIC: return GL_STATIC_DRAW; - case USAGE_DEFAULT: return GL_DYNAMIC_DRAW; - case USAGE_DYNAMIC: return GL_STREAM_DRAW; - case USAGE_CPU_ACCESSIBLE: return GL_DYNAMIC_READ; + case USAGE_STATIC: return GL_STATIC_DRAW; + case USAGE_DEFAULT: return GL_DYNAMIC_DRAW; + case USAGE_DYNAMIC: return GL_STREAM_DRAW; + case USAGE_STAGING: return GL_DYNAMIC_READ; default: UNEXPECTED( "Unknow usage" ); return 0; } } diff --git a/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp index f0319479..5b23d346 100644 --- a/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp @@ -62,7 +62,7 @@ static GLenum GetBufferBindTarget(const BufferDesc& Desc) #endif Target = GL_DRAW_INDIRECT_BUFFER; } - else if (Desc.Usage == USAGE_CPU_ACCESSIBLE && Desc.CPUAccessFlags == CPU_ACCESS_WRITE) + else if (Desc.Usage == USAGE_STAGING && Desc.CPUAccessFlags == CPU_ACCESS_WRITE) Target = GL_PIXEL_UNPACK_BUFFER; return Target; -- cgit v1.2.3