From e224b300b670e075e482cab47ecae7759f19e59d Mon Sep 17 00:00:00 2001 From: saschawillems Date: Wed, 21 Sep 2016 19:48:45 +0200 Subject: [PATCH] Updated SPIR-V shader binaries --- data/shaders/multithreading/phong.vert.spv | Bin 3064 -> 3032 bytes .../multithreading/starsphere.frag.spv | Bin 2888 -> 2888 bytes .../multithreading/starsphere.vert.spv | Bin 1280 -> 1248 bytes multithreading/multithreading.cpp | 67 +----------------- multithreading/multithreading.vcxproj | 6 ++ multithreading/multithreading.vcxproj.filters | 17 +++++ 6 files changed, 24 insertions(+), 66 deletions(-) diff --git a/data/shaders/multithreading/phong.vert.spv b/data/shaders/multithreading/phong.vert.spv index 4923982940bdee89a2d229ac460fea59a11b7826..34453470ae56a4bdd482956cdd865b51b9e07701 100644 GIT binary patch delta 15 Xcmew%enWhM%toCHOq+R_-*5l`HW~&H delta 43 ucmca1{zH6%46h&q6N3T+0|SUw+$edOiPxQhg+T`>q6EYYn_n`$=Kuh))(80j diff --git a/data/shaders/multithreading/starsphere.frag.spv b/data/shaders/multithreading/starsphere.frag.spv index 7fbc1cc39937161731b7a9530ce720691fb8ef7e..3225917ce6455110a415fcb2af0bb8dca275d911 100644 GIT binary patch delta 12 TcmX>hc0z1I3M2c*)W=)^ARGj| delta 12 TcmX>hc0z1I3M0qH)W=)^ARz?3 diff --git a/data/shaders/multithreading/starsphere.vert.spv b/data/shaders/multithreading/starsphere.vert.spv index 055b3352d959592db8fe3d549eb8a3d6695a4515..995bb7e035e4baaf86e72d093fc07ac8e79b3c2a 100644 GIT binary patch delta 15 WcmZqRdcZkBW}{93)8-zg5+(pEqXh;4 delta 43 tcmaFB*}yeHhF6e*i9vyZfdND-Zj=mW;&o?WVUPrhC;>6U=1it?CIF2h1>FDu diff --git a/multithreading/multithreading.cpp b/multithreading/multithreading.cpp index 7f40dc27..5e1adc68 100644 --- a/multithreading/multithreading.cpp +++ b/multithreading/multithreading.cpp @@ -299,15 +299,10 @@ public: &thread->pushConstBlock[cmdBufferIndex]); VkDeviceSize offsets[1] = { 0 }; - //vkCmdBindVertexBuffers(cmdBuffer, 0, 1, &thread->mesh.vertices.buf, offsets); - //vkCmdBindIndexBuffer(cmdBuffer, thread->mesh.indices.buf, 0, VK_INDEX_TYPE_UINT32); - //vkCmdDrawIndexed(cmdBuffer, thread->mesh.indexCount, 1, 0, 0, 0); - vkCmdBindVertexBuffers(cmdBuffer, 0, 1, &meshes.ufo.vertices.buf, offsets); vkCmdBindIndexBuffer(cmdBuffer, meshes.ufo.indices.buf, 0, VK_INDEX_TYPE_UINT32); vkCmdDrawIndexed(cmdBuffer, meshes.ufo.indexCount, 1, 0, 0, 0); - VK_CHECK_RESULT(vkEndCommandBuffer(cmdBuffer)); } @@ -328,7 +323,6 @@ public: vkCmdBindPipeline(secondaryCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.starsphere); - glm::mat4 view = glm::mat4(); view = glm::rotate(view, glm::radians(rotation.x), glm::vec3(1.0f, 0.0f, 0.0f)); view = glm::rotate(view, glm::radians(rotation.y), glm::vec3(0.0f, 1.0f, 0.0f)); @@ -644,63 +638,4 @@ public: } }; -VulkanExample *vulkanExample; - -#if defined(_WIN32) -LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - if (vulkanExample != NULL) - { - vulkanExample->handleMessages(hWnd, uMsg, wParam, lParam); - } - return (DefWindowProc(hWnd, uMsg, wParam, lParam)); -} -#elif defined(__linux__) && !defined(__ANDROID__) -static void handleEvent(const xcb_generic_event_t *event) -{ - if (vulkanExample != NULL) - { - vulkanExample->handleEvent(event); - } -} -#endif - -// Main entry point -#if defined(_WIN32) -// Windows entry point -int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLine, int nCmdShow) -#elif defined(__ANDROID__) -// Android entry point -void android_main(android_app* state) -#elif defined(__linux__) -// Linux entry point -int main(const int argc, const char *argv[]) -#endif -{ -#if defined(__ANDROID__) - // Removing this may cause the compiler to omit the main entry point - // which would make the application crash at start - app_dummy(); -#endif - vulkanExample = new VulkanExample(); -#if defined(_WIN32) - vulkanExample->setupWindow(hInstance, WndProc); -#elif defined(__ANDROID__) - // Attach vulkan example to global android application state - state->userData = vulkanExample; - state->onAppCmd = VulkanExample::handleAppCommand; - state->onInputEvent = VulkanExample::handleAppInput; - vulkanExample->androidApp = state; -#elif defined(__linux__) - vulkanExample->setupWindow(); -#endif -#if !defined(__ANDROID__) - vulkanExample->initSwapchain(); - vulkanExample->prepare(); -#endif - vulkanExample->renderLoop(); - delete(vulkanExample); -#if !defined(__ANDROID__) - return 0; -#endif -} \ No newline at end of file +VULKAN_EXAMPLE_MAIN() \ No newline at end of file diff --git a/multithreading/multithreading.vcxproj b/multithreading/multithreading.vcxproj index 67963693..7003ae35 100644 --- a/multithreading/multithreading.vcxproj +++ b/multithreading/multithreading.vcxproj @@ -23,6 +23,12 @@ + + + + + + {F5703C3C-F495-4D5C-BAA5-A90C4E20C7B7} mesh diff --git a/multithreading/multithreading.vcxproj.filters b/multithreading/multithreading.vcxproj.filters index 73374a15..1311ea18 100644 --- a/multithreading/multithreading.vcxproj.filters +++ b/multithreading/multithreading.vcxproj.filters @@ -13,6 +13,9 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {1a2e15c8-5d53-4bb1-bfe2-a3085baadc4f} + @@ -45,4 +48,18 @@ Header Files + + + Shaders + + + Shaders + + + Shaders + + + Shaders + + \ No newline at end of file