From a60ef4fb5ad8dc90f14f041c237b799c89690970 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Tue, 15 Dec 2015 18:32:30 -0800
Subject: [PATCH] Finalize the names

---
 libraries/gpu/src/gpu/Batch.cpp                  | 4 ++--
 libraries/gpu/src/gpu/Batch.h                    | 6 +++---
 libraries/gpu/src/gpu/GLBackend.cpp              | 2 +-
 libraries/gpu/src/gpu/GLBackend.h                | 2 +-
 libraries/gpu/src/gpu/GLBackendTexture.cpp       | 2 +-
 libraries/render-utils/src/ToneMappingEffect.cpp | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/gpu/src/gpu/Batch.cpp b/libraries/gpu/src/gpu/Batch.cpp
index 843eb3d3a5..f9c4131a1b 100644
--- a/libraries/gpu/src/gpu/Batch.cpp
+++ b/libraries/gpu/src/gpu/Batch.cpp
@@ -311,8 +311,8 @@ void Batch::blit(const FramebufferPointer& src, const Vec4i& srcViewport,
     _params.push_back(dstViewport.w);
 }
 
-void Batch::generateTextureMipmap(const TexturePointer& texture) {
-    ADD_COMMAND(generateTextureMipmap);
+void Batch::generateTextureMips(const TexturePointer& texture) {
+    ADD_COMMAND(generateTextureMips);
 
     _params.push_back(_textures.cache(texture));
 }
diff --git a/libraries/gpu/src/gpu/Batch.h b/libraries/gpu/src/gpu/Batch.h
index 122285f5ea..88d28f9d10 100644
--- a/libraries/gpu/src/gpu/Batch.h
+++ b/libraries/gpu/src/gpu/Batch.h
@@ -211,8 +211,8 @@ public:
     // 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);
 
-    // Generate the mipmap for a texture
-    void generateTextureMipmap(const TexturePointer& texture);
+    // Generate the mips for a texture
+    void generateTextureMips(const TexturePointer& texture);
 
     // Query Section
     void beginQuery(const QueryPointer& query);
@@ -295,7 +295,7 @@ public:
         COMMAND_setFramebuffer,
         COMMAND_clearFramebuffer,
         COMMAND_blit,
-        COMMAND_generateTextureMipmap,
+        COMMAND_generateTextureMips,
 
         COMMAND_beginQuery,
         COMMAND_endQuery,
diff --git a/libraries/gpu/src/gpu/GLBackend.cpp b/libraries/gpu/src/gpu/GLBackend.cpp
index ff1b207f7c..a730c06bd9 100644
--- a/libraries/gpu/src/gpu/GLBackend.cpp
+++ b/libraries/gpu/src/gpu/GLBackend.cpp
@@ -52,7 +52,7 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] =
     (&::gpu::GLBackend::do_setFramebuffer),
     (&::gpu::GLBackend::do_clearFramebuffer),
     (&::gpu::GLBackend::do_blit),
-    (&::gpu::GLBackend::do_generateTextureMipmap),
+    (&::gpu::GLBackend::do_generateTextureMips),
 
     (&::gpu::GLBackend::do_beginQuery),
     (&::gpu::GLBackend::do_endQuery),
diff --git a/libraries/gpu/src/gpu/GLBackend.h b/libraries/gpu/src/gpu/GLBackend.h
index 4733d81cbf..400c9f08f8 100644
--- a/libraries/gpu/src/gpu/GLBackend.h
+++ b/libraries/gpu/src/gpu/GLBackend.h
@@ -436,7 +436,7 @@ protected:
     void do_setFramebuffer(Batch& batch, size_t paramOffset);
     void do_clearFramebuffer(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
     void syncOutputStateCache();
diff --git a/libraries/gpu/src/gpu/GLBackendTexture.cpp b/libraries/gpu/src/gpu/GLBackendTexture.cpp
index 18b4065b77..17802ae6ed 100755
--- a/libraries/gpu/src/gpu/GLBackendTexture.cpp
+++ b/libraries/gpu/src/gpu/GLBackendTexture.cpp
@@ -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);
     if (!resourceTexture) {
         return;
diff --git a/libraries/render-utils/src/ToneMappingEffect.cpp b/libraries/render-utils/src/ToneMappingEffect.cpp
index 23d0b3c800..22c31a2459 100644
--- a/libraries/render-utils/src/ToneMappingEffect.cpp
+++ b/libraries/render-utils/src/ToneMappingEffect.cpp
@@ -110,7 +110,7 @@ void ToneMappingEffect::render(RenderArgs* args) {
         auto destFbo = framebufferCache->getPrimaryFramebuffer();
         batch.setFramebuffer(destFbo);
 
-        batch.generateTextureMipmap(lightingBuffer);
+        batch.generateTextureMips(lightingBuffer);
 
         batch.setViewportTransform(args->_viewport);
         batch.setProjectionTransform(glm::mat4());