Finalize the names

This commit is contained in:
samcake 2015-12-15 18:32:30 -08:00
parent c2feec16de
commit a60ef4fb5a
6 changed files with 9 additions and 9 deletions

View file

@ -311,8 +311,8 @@ void Batch::blit(const FramebufferPointer& src, const Vec4i& srcViewport,
_params.push_back(dstViewport.w); _params.push_back(dstViewport.w);
} }
void Batch::generateTextureMipmap(const TexturePointer& texture) { void Batch::generateTextureMips(const TexturePointer& texture) {
ADD_COMMAND(generateTextureMipmap); ADD_COMMAND(generateTextureMips);
_params.push_back(_textures.cache(texture)); _params.push_back(_textures.cache(texture));
} }

View file

@ -211,8 +211,8 @@ public:
// with xy and zw the bounding corners of the rect region. // with xy and zw the bounding corners of the rect region.
void blit(const FramebufferPointer& src, const Vec4i& srcRect, const FramebufferPointer& dst, const Vec4i& dstRect); void blit(const FramebufferPointer& src, const Vec4i& srcRect, const FramebufferPointer& dst, const Vec4i& dstRect);
// Generate the mipmap for a texture // Generate the mips for a texture
void generateTextureMipmap(const TexturePointer& texture); void generateTextureMips(const TexturePointer& texture);
// Query Section // Query Section
void beginQuery(const QueryPointer& query); void beginQuery(const QueryPointer& query);
@ -295,7 +295,7 @@ public:
COMMAND_setFramebuffer, COMMAND_setFramebuffer,
COMMAND_clearFramebuffer, COMMAND_clearFramebuffer,
COMMAND_blit, COMMAND_blit,
COMMAND_generateTextureMipmap, COMMAND_generateTextureMips,
COMMAND_beginQuery, COMMAND_beginQuery,
COMMAND_endQuery, COMMAND_endQuery,

View file

@ -52,7 +52,7 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] =
(&::gpu::GLBackend::do_setFramebuffer), (&::gpu::GLBackend::do_setFramebuffer),
(&::gpu::GLBackend::do_clearFramebuffer), (&::gpu::GLBackend::do_clearFramebuffer),
(&::gpu::GLBackend::do_blit), (&::gpu::GLBackend::do_blit),
(&::gpu::GLBackend::do_generateTextureMipmap), (&::gpu::GLBackend::do_generateTextureMips),
(&::gpu::GLBackend::do_beginQuery), (&::gpu::GLBackend::do_beginQuery),
(&::gpu::GLBackend::do_endQuery), (&::gpu::GLBackend::do_endQuery),

View file

@ -436,7 +436,7 @@ protected:
void do_setFramebuffer(Batch& batch, size_t paramOffset); void do_setFramebuffer(Batch& batch, size_t paramOffset);
void do_clearFramebuffer(Batch& batch, size_t paramOffset); void do_clearFramebuffer(Batch& batch, size_t paramOffset);
void do_blit(Batch& batch, size_t paramOffset); void do_blit(Batch& batch, size_t paramOffset);
void do_generateTextureMipmap(Batch& batch, size_t paramOffset); void do_generateTextureMips(Batch& batch, size_t paramOffset);
// Synchronize the state cache of this Backend with the actual real state of the GL Context // Synchronize the state cache of this Backend with the actual real state of the GL Context
void syncOutputStateCache(); void syncOutputStateCache();

View file

@ -590,7 +590,7 @@ void GLBackend::syncSampler(const Sampler& sampler, Texture::Type type, GLTextur
void GLBackend::do_generateTextureMipmap(Batch& batch, size_t paramOffset) { void GLBackend::do_generateTextureMips(Batch& batch, size_t paramOffset) {
TexturePointer resourceTexture = batch._textures.get(batch._params[paramOffset + 0]._uint); TexturePointer resourceTexture = batch._textures.get(batch._params[paramOffset + 0]._uint);
if (!resourceTexture) { if (!resourceTexture) {
return; return;

View file

@ -110,7 +110,7 @@ void ToneMappingEffect::render(RenderArgs* args) {
auto destFbo = framebufferCache->getPrimaryFramebuffer(); auto destFbo = framebufferCache->getPrimaryFramebuffer();
batch.setFramebuffer(destFbo); batch.setFramebuffer(destFbo);
batch.generateTextureMipmap(lightingBuffer); batch.generateTextureMips(lightingBuffer);
batch.setViewportTransform(args->_viewport); batch.setViewportTransform(args->_viewport);
batch.setProjectionTransform(glm::mat4()); batch.setProjectionTransform(glm::mat4());