From 988d8c7d232f707999e1ac9f6b61667dfd7f0179 Mon Sep 17 00:00:00 2001
From: bjorn <tie.372@gmail.com>
Date: Mon, 19 Mar 2018 12:12:34 -0700
Subject: [PATCH] Rename blit to fill;

---
 src/api/graphics.c      | 6 +++---
 src/graphics/graphics.c | 4 ++--
 src/graphics/graphics.h | 2 +-
 src/graphics/shader.c   | 2 +-
 src/graphics/shader.h   | 2 +-
 src/headset/openvr.c    | 2 +-
 src/resources/shaders.c | 2 +-
 src/resources/shaders.h | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/api/graphics.c b/src/api/graphics.c
index bb7170b6..07a999a5 100644
--- a/src/api/graphics.c
+++ b/src/api/graphics.c
@@ -811,9 +811,9 @@ int l_lovrGraphicsStencil(lua_State* L) {
   return 0;
 }
 
-int l_lovrGraphicsBlit(lua_State* L) {
+int l_lovrGraphicsFill(lua_State* L) {
   Texture* texture = luax_checktypeof(L, 1, Texture);
-  lovrGraphicsBlit(texture);
+  lovrGraphicsFill(texture);
   return 0;
 }
 
@@ -1173,7 +1173,7 @@ const luaL_Reg lovrGraphics[] = {
   { "skybox", l_lovrGraphicsSkybox },
   { "print", l_lovrGraphicsPrint },
   { "stencil", l_lovrGraphicsStencil },
-  { "blit", l_lovrGraphicsBlit },
+  { "fill", l_lovrGraphicsFill },
   { "newAnimator", l_lovrGraphicsNewAnimator },
   { "newCanvas", l_lovrGraphicsNewCanvas },
   { "newFont", l_lovrGraphicsNewFont },
diff --git a/src/graphics/graphics.c b/src/graphics/graphics.c
index 694cee90..4e0f4e32 100644
--- a/src/graphics/graphics.c
+++ b/src/graphics/graphics.c
@@ -1068,7 +1068,7 @@ void lovrGraphicsStencil(StencilAction action, int replaceValue, StencilCallback
   lovrGraphicsSetStencilTest(state.stencilMode, state.stencilValue);
 }
 
-void lovrGraphicsBlit(Texture* texture) {
+void lovrGraphicsFill(Texture* texture) {
   float vertices[] = {
     -1, 1, 0,  0, 0, 0, 0, 1,
     -1, -1, 0, 0, 0, 0, 0, 0,
@@ -1076,7 +1076,7 @@ void lovrGraphicsBlit(Texture* texture) {
     1, -1, 0,  0, 0, 0, 1, 0
   };
 
-  lovrGraphicsSetDefaultShader(SHADER_BLIT);
+  lovrGraphicsSetDefaultShader(SHADER_FILL);
   Material* material = lovrGraphicsGetDefaultMaterial();
   lovrMaterialSetTexture(material, TEXTURE_DIFFUSE, texture);
   VertexPointer vertexPointer = lovrGraphicsGetVertexPointer(4);
diff --git a/src/graphics/graphics.h b/src/graphics/graphics.h
index 4774b15f..e6cf1335 100644
--- a/src/graphics/graphics.h
+++ b/src/graphics/graphics.h
@@ -202,7 +202,7 @@ void lovrGraphicsSphere(Material* material, mat4 transform, int segments);
 void lovrGraphicsSkybox(Texture* texture, float angle, float ax, float ay, float az);
 void lovrGraphicsPrint(const char* str, mat4 transform, float wrap, HorizontalAlign halign, VerticalAlign valign);
 void lovrGraphicsStencil(StencilAction action, int replaceValue, StencilCallback callback, void* userdata);
-void lovrGraphicsBlit(Texture* texture);
+void lovrGraphicsFill(Texture* texture);
 
 // Internal State
 VertexPointer lovrGraphicsGetVertexPointer(uint32_t capacity);
diff --git a/src/graphics/shader.c b/src/graphics/shader.c
index e793a0d5..39548345 100644
--- a/src/graphics/shader.c
+++ b/src/graphics/shader.c
@@ -271,7 +271,7 @@ Shader* lovrShaderCreateDefault(DefaultShader type) {
     case SHADER_CUBE: return lovrShaderCreate(lovrCubeVertexShader, lovrCubeFragmentShader); break;
     case SHADER_PANO: return lovrShaderCreate(lovrCubeVertexShader, lovrPanoFragmentShader); break;
     case SHADER_FONT: return lovrShaderCreate(NULL, lovrFontFragmentShader);
-    case SHADER_BLIT: return lovrShaderCreate(lovrBlitVertexShader, NULL);
+    case SHADER_FILL: return lovrShaderCreate(lovrFillVertexShader, NULL);
     default: lovrThrow("Unknown default shader type");
   }
 }
diff --git a/src/graphics/shader.h b/src/graphics/shader.h
index 74437377..5d59a1e8 100644
--- a/src/graphics/shader.h
+++ b/src/graphics/shader.h
@@ -37,7 +37,7 @@ typedef enum {
   SHADER_CUBE,
   SHADER_PANO,
   SHADER_FONT,
-  SHADER_BLIT
+  SHADER_FILL
 } DefaultShader;
 
 typedef struct {
diff --git a/src/headset/openvr.c b/src/headset/openvr.c
index d6df74a1..782d8c5e 100644
--- a/src/headset/openvr.c
+++ b/src/headset/openvr.c
@@ -732,7 +732,7 @@ static void openvrRenderTo(void (*callback)(void*), void* userdata) {
     Shader* lastShader = lovrGraphicsGetShader();
     lovrRetain(lastShader);
     lovrGraphicsSetShader(NULL);
-    lovrGraphicsBlit(&state.canvas->texture);
+    lovrGraphicsFill(&state.canvas->texture);
     lovrGraphicsSetShader(lastShader);
     lovrRelease(lastShader);
     lovrGraphicsSetColor(oldColor);
diff --git a/src/resources/shaders.c b/src/resources/shaders.c
index b935fb23..a0048c63 100644
--- a/src/resources/shaders.c
+++ b/src/resources/shaders.c
@@ -155,7 +155,7 @@ const char* lovrFontFragmentShader = ""
 "  return vec4(graphicsColor.rgb, graphicsColor.a * alpha); \n"
 "}";
 
-const char* lovrBlitVertexShader = ""
+const char* lovrFillVertexShader = ""
 "#define MONOSCOPIC \n"
 "vec4 position(mat4 projection, mat4 transform, vec4 vertex) { \n"
 "  return vertex; \n"
diff --git a/src/resources/shaders.h b/src/resources/shaders.h
index 28da32f9..c32d5e3c 100644
--- a/src/resources/shaders.h
+++ b/src/resources/shaders.h
@@ -13,4 +13,4 @@ extern const char* lovrCubeVertexShader;
 extern const char* lovrCubeFragmentShader;
 extern const char* lovrPanoFragmentShader;
 extern const char* lovrFontFragmentShader;
-extern const char* lovrBlitVertexShader;
+extern const char* lovrFillVertexShader;