Changeset 40995d3 in opengl-game for vulkan-ref.cpp


Ignore:
Timestamp:
Oct 1, 2019, 3:14:06 AM (5 years ago)
Author:
Dmitry Portnoy <dmp1488@…>
Branches:
feature/imgui-sdl, master, points-test
Children:
4d84c72
Parents:
7563b8a (diff), a0da009 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of medievaltech.com:opengl-game

File:
1 edited

Legend:

Unmodified
Added
Removed
  • vulkan-ref.cpp

    r7563b8a r40995d3  
    330330/*** END OF REFACTORED CODE ***/
    331331
     332         // THIS SECTION IS WHERE TEXTURES ARE CREATED, MAYBE SPLIT IT OFF INTO A SEPARATE FUNCTION
     333         // MAY WANT TO CREATE A STRUCT TO HOLD SIMILAR VARIABLES< LIKE THOSE FOR A TEXTURE
     334
    332335         createImageResources("textures/texture.jpg", textureImage, textureImageMemory, textureImageView);
    333336         createImageResourcesFromSDLTexture(uiOverlay, sdlOverlayImage, sdlOverlayImageMemory, sdlOverlayImageView);
     
    343346         overlayImageInfo.imageView = sdlOverlayImageView;
    344347         overlayImageInfo.sampler = textureSampler;
     348
     349         // SHADER-SPECIFIC STUFF STARTS HERE
    345350
    346351         vector<Vertex> sceneVertices = {
Note: See TracChangeset for help on using the changeset viewer.