Changeset d25381b in opengl-game for vulkan-game.hpp


Ignore:
Timestamp:
Feb 18, 2020, 9:33:34 PM (5 years ago)
Author:
Dmitry Portnoy <dmitry.portnoy@…>
Branches:
feature/imgui-sdl, master, points-test
Children:
860a0da
Parents:
2d87297
git-author:
Dmitry Portnoy <dmitry.portnoy@…> (02/16/20 21:16:53)
git-committer:
Dmitry Portnoy <dmitry.portnoy@…> (02/18/20 21:33:34)
Message:

In VulkanGame, rename fields related to the ubo and ssbo for the model pipeline to end in _modelPipeline rather than scenePipeline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • vulkan-game.hpp

    r2d87297 rd25381b  
    148148
    149149      GraphicsPipeline_Vulkan<OverlayVertex, void*> overlayPipeline;
    150 
    151150      vector<SceneObject<OverlayVertex, void*>> overlayObjects;
    152151
    153       // TODO: Rename all the variables related to modelPipeline to use the same pipelie name
    154 
    155152      GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject> modelPipeline;
    156 
    157153      vector<SceneObject<ModelVertex, SSBO_ModelObject>> modelObjects;
    158154
    159       vector<VkBuffer> uniformBuffers_scenePipeline;
    160       vector<VkDeviceMemory> uniformBuffersMemory_scenePipeline;
    161       vector<VkDescriptorBufferInfo> uniformBufferInfoList_scenePipeline;
    162 
    163       vector<VkBuffer> storageBuffers_scenePipeline;
    164       vector<VkDeviceMemory> storageBuffersMemory_scenePipeline;
    165       vector<VkDescriptorBufferInfo> storageBufferInfoList_scenePipeline;
     155      vector<VkBuffer> uniformBuffers_modelPipeline;
     156      vector<VkDeviceMemory> uniformBuffersMemory_modelPipeline;
     157      vector<VkDescriptorBufferInfo> uniformBufferInfoList_modelPipeline;
     158
     159      vector<VkBuffer> storageBuffers_modelPipeline;
     160      vector<VkDeviceMemory> storageBuffersMemory_modelPipeline;
     161      vector<VkDescriptorBufferInfo> storageBufferInfoList_modelPipeline;
    166162
    167163      UBO_VP_mats object_VP_mats;
     
    169165
    170166      GraphicsPipeline_Vulkan<ShipVertex, SSBO_ModelObject> shipPipeline;
    171 
    172167      vector<SceneObject<ShipVertex, SSBO_ModelObject>> shipObjects;
    173168
     
    184179
    185180      GraphicsPipeline_Vulkan<AsteroidVertex, SSBO_Asteroid> asteroidPipeline;
    186 
    187181      vector<SceneObject<AsteroidVertex, SSBO_Asteroid>> asteroidObjects;
    188182
Note: See TracChangeset for help on using the changeset viewer.