Index: TODO.txt
===================================================================
--- TODO.txt	(revision e3bef3a2058476813ba097faca8f7f9e5175d1e6)
+++ TODO.txt	(revision cd487fb0c5641b29746b810d236ba7681bd75081)
@@ -18,14 +18,2 @@
    -Maybe separate out the camera controls
 -Turn the game into more of an overhead view RTS where you can use the mouse to select and move ships
-
-Apparently a new pipeline is required for every type of shader
-However, it seems like I should only need one swap chain 
-Seems like I'll have to create a new set of framebuffers and a new set of command buffers as well
-
-I will definitely have to create new command buffers, since that's where I specify the vertex buffers and
-index buffer for the draw operation
-
-We'll need to have a separate command buffer for every framebuffer in the swapchain
-
-Actually, I could probably just have multiple vkCmdDraw calls in each command buffer and rebind to a different
-pipeline between each one
Index: graphics-pipeline_vulkan.cpp
===================================================================
--- graphics-pipeline_vulkan.cpp	(revision e3bef3a2058476813ba097faca8f7f9e5175d1e6)
+++ graphics-pipeline_vulkan.cpp	(revision cd487fb0c5641b29746b810d236ba7681bd75081)
@@ -3,9 +3,6 @@
 #include <fstream>
 #include <stdexcept>
-#include <iostream>
 
 using namespace std;
-
-// TODO: Remove any instances of cout and instead throw exceptions
 
 GraphicsPipeline_Vulkan::GraphicsPipeline_Vulkan(VkPhysicalDevice physicalDevice, VkDevice device,
@@ -315,5 +312,5 @@
                break;
             default:
-               cout << "Unknown descriptor type: " << descriptorWrites[j].descriptorType << endl;
+               throw runtime_error("Unknown descriptor type: " + to_string(descriptorWrites[j].descriptorType));
          }
       }
Index: graphics-pipeline_vulkan.hpp
===================================================================
--- graphics-pipeline_vulkan.hpp	(revision e3bef3a2058476813ba097faca8f7f9e5175d1e6)
+++ graphics-pipeline_vulkan.hpp	(revision cd487fb0c5641b29746b810d236ba7681bd75081)
@@ -4,5 +4,5 @@
 #include "graphics-pipeline.hpp"
 
-#include <iostream>
+#include <stdexcept>
 #include <vector>
 
@@ -12,6 +12,4 @@
 
 using namespace std;
-
-// TODO: Remove any instances of cout and instead throw exceptions
 
 // TODO: Maybe change the name of this struct so I can call the list something other than descriptorInfoList
@@ -113,13 +111,10 @@
 bool GraphicsPipeline_Vulkan::addObject(const vector<VertexType>& vertices, vector<uint16_t>& indices,
       VkCommandPool commandPool, VkQueue graphicsQueue) {
-   cout << "Adding object to pipeline..." << endl;
 
    if (numVertices + vertices.size() > vertexCapacity) {
-      cout << "ERROR: Need to resize vertex buffers" << endl;
+      throw runtime_error("ERROR: Need to resize vertex buffers");
    } else if (numIndices + indices.size() > indexCapacity) {
-      cout << "ERROR: Need to resize index buffers" << endl;
+      throw runtime_error("ERROR: Need to resize index buffers");
    } else {
-      cout << "Added object to scene" << endl;
-
       for (uint16_t& idx : indices) {
          idx += numVertices;
Index: vulkan-game.cpp
===================================================================
--- vulkan-game.cpp	(revision e3bef3a2058476813ba097faca8f7f9e5175d1e6)
+++ vulkan-game.cpp	(revision cd487fb0c5641b29746b810d236ba7681bd75081)
@@ -165,4 +165,6 @@
       return RTWO_ERROR;
    }
+
+   SDL_SetRenderTarget(renderer, uiOverlay);
 
    return RTWO_SUCCESS;
@@ -333,8 +335,4 @@
 
 void VulkanGame::renderUI() {
-   // TODO: Since I currently don't use any other render targets,
-   // I may as well set this once before the render loop
-   SDL_SetRenderTarget(renderer, uiOverlay);
-
    SDL_SetRenderDrawColor(renderer, 0x00, 0x00, 0x00, 0x00);
    SDL_RenderClear(renderer);
Index: vulkan-ref.cpp
===================================================================
--- vulkan-ref.cpp	(revision e3bef3a2058476813ba097faca8f7f9e5175d1e6)
+++ vulkan-ref.cpp	(revision cd487fb0c5641b29746b810d236ba7681bd75081)
@@ -1716,5 +1716,5 @@
 
       void mainLoop() {
-         // TODO: Create some generic event-handling functions in game-gui-*
+         // TODO: Create some generic event-handling functions in game-gui
          SDL_Event e;
          bool quit = false;