Fixed chapters 4, 5. Renamed class. Minor updates

Author: HarryLovesCode

.buildconfig

@@ -1 +1,2 @@
 SUBDIRS = chap02 chap03 chap04 chap05 chap06 chap07 chap08 chap09 chap10
+

Makefile.am

@@ -1,54 +1,40 @@
 # Vulkan API
 
-Hello everyone. This is going to be a technical book about the newly published Vulkan specification. We'll go over different topics such as...
+## An Introduction
+
+This is going to be a technical book about the newly published Vulkan specification. We'll go over different topics such as:
 
-- Extensions
 - Getting started
 - Instances
-- Physical & logical devices
-- Queues
-- Surfaces
-- Swap chains
+- Physical and logical devices
 - Windowing across different platforms
-- And more!
+- Surfaces
+- Swapchains
+- Image layouts
+- Image views
+- Please see the table-of-contents for more!
+
+## Resources
 
-# Resources
+While resources are added everyday, there are a few I'd thoroughly recommend checking out:
 
 - [Vulkan Quick Reference v1.0](https://www.khronos.org/files/vulkan10-reference-guide.pdf)
 - [Vulkan Specification v1.0.9](https://www.khronos.org/registry/vulkan/specs/1.0/xhtml/vkspec.html)
 - [Vulkan Specification v1.0.9 + WSI Extensions](https://www.khronos.org/registry/vulkan/specs/1.0-wsi_extensions/xhtml/vkspec.html)
 - [Sascha Willem's Vulkan Samples](https://github.com/SaschaWillems/Vulkan)
 - [Vulkan in 30 Minutes](https://renderdoc.org/vulkan-in-30-minutes.html)
 
-# Code
-
-You can find the Github repository [here](https://github.com/HarryLovesCode/Vulkan-API-Book). For now, only Linux and Windows are **officially** supported. 
-
-# Building the Book
-
-Currently there are two ways of building the book. 
-
-### Pandoc (Preferred)
-
-Use the `book.sh` script which runs Pandoc and produces the book in `epub` and `pdf` formats.
-
-### Gitbook
-
-You can find information on how to get it [here](https://github.com/GitbookIO/gitbook-cli). Then simply run:
-
-```sh
-gitbook build
-```
+## Code
 
-In the root directory.
+You can find the repository on Github at [HarryLovesCode/Vulkan-API-Book](https://github.com/HarryLovesCode/Vulkan-API-Book). For now, only Linux and Windows are **officially** supported. However, Android support is in the works. 
 
-# Reading the Book
+## Reading the Book
 
-You can find the latest stable version [on the release page](https://github.com/HarryLovesCode/Vulkan-API-Book/releases).
+You can find the latest stable version [on the Github releases page](https://github.com/HarryLovesCode/Vulkan-API-Book/releases). Otherwise, you can read it on [Gitbook](https://harrylovescode.gitbooks.io/vulkan-api/content/). If you'd like to build it yourself, you will need `pandoc`, `xetex` (for Linux), and `latex-extras` installed.
 
-# Building Code on Linux
+## Building Code on Linux
 
-To build on Linux, use the following commands:
+To build on Linux, you will need to make sure you have Vulkan headers available. Also, you will need `autotools`. When in doubt, look at your distribution's package repositories. You can use these commands.
 
 ```sh
 git clone https://github.com/HarryLovesCode/Vulkan-API-Book
@@ -59,12 +45,12 @@ autoreconf --install
 make -j4
 ```
 
-Once you've done that, you should find all the binaries located in the `./bin` folder.
+Once you've done that, you will find all the binaries located in the `./bin` folder.
 
-# Building Code on Windows
+## Building Code on Windows
 
-To build on Windows, you'll need Visual Studio 2015. You can find the Visual Studio solution in the root directory of the repository. Just open that and you can pick and choose which chapters to build and run.
+To build on Windows, you'll need Visual Studio 2015. You can find the Visual Studio solution in the root directory of the repository. Just open that, choose a startup project, and you're ready to go.
 
-# Who am I?
+## A Little About Me
 
-I'm Harry and I'm a young developer who enjoys 3D graphics. I've worked with WebGL, OpenGL, and DirectX and when I heard about Vulkan, I was excited to get started! This is, in a way, and experiment because I'm publishing as I go. Thus, the book may be rough around the edges. Feel free to submit issues or pull requests on Github and add inline comments through Gitbook.
+I'm Harry and I'm a young developer who enjoys 3D graphics. I've worked with WebGL, OpenGL, and DirectX and when I heard about Vulkan, I was excited to get started. The publishing of this book is, in a way, and experiment because I'm publishing as I go. Thus, the book may be rough around the edges. Feel free to submit issues or pull requests on Github and add inline comments through Gitbook.

README.md

@@ -35,7 +35,7 @@ You can find the repository on Github at [HarryLovesCode/Vulkan-API-Book](https:
 
 ## Reading the Book
 
-You can find the latest stable version [on the Github releases page](https://github.com/HarryLovesCode/Vulkan-API-Book/releases). Otherwise, you can read it on [Gitbook](https://harrylovescode.gitbooks.io/vulkan-api/content/). If you'd like to build it yourself, you will need *pandoc*, *xetex* (for Linux), and *latex extras* installed.
+You can find the latest stable version [on the Github releases page](https://github.com/HarryLovesCode/Vulkan-API-Book/releases). Otherwise, you can read it on [Gitbook](https://harrylovescode.gitbooks.io/vulkan-api/content/). If you'd like to build it yourself, you will need `pandoc`, `xetex` (for Linux), and `latex-extras` installed.
 
 ## Building Code on Linux
 

book.md

@@ -8,16 +8,17 @@ pandoc book.md                  \
   chap04/chap04.md              \
   chap04/chap04-linux.md        \
   chap04/chap04-windows.md      \
-  chap05/chap05.md              \
+  chap05/chap05_0.md            \
   chap05/chap05-windows.md      \
   chap05/chap05-linux.md        \
+  chap05/chap05_1.md            \
   chap06/chap06.md              \
   chap07/chap07.md              \
   chap08/chap08.md              \
   chap09/chap09.md              \
 --toc                           \
 --epub-stylesheet book.css      \
--o VulkanApiBook.epub 
+-o VulkanApiBook.epub
 
 # Generate the .pdf version of the book
 echo "Generating PDF"
@@ -27,9 +28,10 @@ pandoc book.md                  \
   chap04/chap04.md              \
   chap04/chap04-linux.md        \
   chap04/chap04-windows.md      \
-  chap05/chap05.md              \
+  chap05/chap05_0.md            \
   chap05/chap05-windows.md      \
   chap05/chap05-linux.md        \
+  chap05/chap05_1.md            \
   chap06/chap06.md              \
   chap07/chap07.md              \
   chap08/chap08.md              \
@@ -43,4 +45,4 @@ pandoc book.md                  \
 -V geometry:margin="2.0cm"      \
 --chapters                      \
 --highlight-style tango         \
--o VulkanApiBook.pdf
+-o VulkanApiBook.pdf

book.sh

@@ -1,3 +1,3 @@
-#include "VulkanExample.hpp"
+#include "VulkanSwapchain.hpp"
 
-int main(int argc, char* argv[]) { VulkanExample ve = VulkanExample(); }
+int main(int argc, char* argv[]) { VulkanSwapchain ve = VulkanSwapchain(); }

chap02/Main.cpp

@@ -1,5 +1,5 @@
 bin_PROGRAMS = $(top_builddir)/bin/chap02
-__top_builddir__bin_chap02_SOURCES = Main.cpp VulkanExample.cpp
+__top_builddir__bin_chap02_SOURCES = Main.cpp VulkanSwapchain.cpp
 __top_builddir__bin_chap02_CPPFLAGS = -std=c++11 -DVK_USE_PLATFORM_XCB_KHR
 __top_builddir__bin_chap02_LDFLAGS = -lvulkan
 

chap02/Makefile.am

@@ -1,15 +1,15 @@
-#include "VulkanExample.hpp"
+#include "VulkanSwapchain.hpp"
 
-VulkanExample::VulkanExample() { initInstance(); }
+VulkanSwapchain::VulkanSwapchain() { initInstance(); }
 
-VulkanExample::~VulkanExample() { vkDestroyInstance(instance, NULL); }
+VulkanSwapchain::~VulkanSwapchain() { vkDestroyInstance(instance, NULL); }
 
-void VulkanExample::exitOnError(const char* msg) {
+void VulkanSwapchain::exitOnError(const char* msg) {
   fputs(msg, stderr);
   exit(EXIT_FAILURE);
 }
 
-void VulkanExample::initInstance() {
+void VulkanSwapchain::initInstance() {
   VkApplicationInfo appInfo = {};
   appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
   appInfo.pNext = NULL;

chap02/VulkanExample.cpp chap02/VulkanSwapchain.cppchap02/VulkanExample.cpp renamed to chap02/VulkanSwapchain.cpp

@@ -2,11 +2,12 @@
 #define VULKAN_EXAMPLE_HPP
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <vector>
 
 #include <vulkan/vulkan.h>
 
-class VulkanExample {
+class VulkanSwapchain {
  private:
   void exitOnError(const char* msg);
   void initInstance();
@@ -17,8 +18,8 @@ class VulkanExample {
   VkInstance instance;
 
  public:
-  VulkanExample();
-  virtual ~VulkanExample();
+  VulkanSwapchain();
+  virtual ~VulkanSwapchain();
 };
 
 #endif  // VULKAN_EXAMPLE_HPP

chap02/VulkanExample.hpp chap02/VulkanSwapchain.hppchap02/VulkanExample.hpp renamed to chap02/VulkanSwapchain.hpp

@@ -4,14 +4,16 @@ Before we are able to start using Vulkan, we must first create an instance. A `V
 
 ```cpp
 #include <stdio.h>
+#include <stdlib.h>
 #include <vector>
+
 #include <vulkan/vulkan.h>
 ```
 
-We'll be storing all of our variables in a class we'll call `VulkanExample` for now. The code will start out looking like:
+We'll be storing all of our variables in a class we'll call `VulkanSwapchain` for now. The code will start out looking like:
 
 ```cpp
-class VulkanExample {
+class VulkanSwapchain {
  private:
   void exitOnError(const char* msg);
   void initInstance();
@@ -21,8 +23,8 @@ class VulkanExample {
 
   VkInstance instance;
  public:
-  VulkanExample();
-  virtual ~VulkanExample();
+  VulkanSwapchain();
+  virtual ~VulkanSwapchain();
 };
 ```
 
@@ -69,7 +71,7 @@ appInfo.apiVersion = VK_MAKE_VERSION(1, 0, 3);
 
 You'll notice that for `apiVersion`, I am using `VK_MAKE_VERSION`. This allows the developer to specify a targeted Vulkan version. We'll see later that if the version we try to get is unsupported, we'll get an error called `VK_ERROR_INCOMPATIBLE_DRIVER`.
 
-## Instance Creation Information
+## Instance Create Information
 
 `VkInstanceCreateInfo` will be used to inform Vulkan of our application info, layers we'll be using, and extensions we want.
 
@@ -178,7 +180,7 @@ if (res == VK_ERROR_INCOMPATIBLE_DRIVER) {
 Our `exitOnError` method is simple at the moment. We'll make some minor changes to it when we start working with windows, but for now, this will fulfill our needs:
 
 ```cpp
-void VulkanExample::exitOnError(const char* msg) {
+void VulkanSwapchain::exitOnError(const char* msg) {
   fputs(msg, stderr);
   exit(EXIT_FAILURE);
 }
@@ -189,7 +191,7 @@ void VulkanExample::exitOnError(const char* msg) {
 Exiting should be graceful if possible. In the case that our destructor is called, we will destroy the instance we created. Afterwards, the program will exit. The destructor looks like this:
 
 ```cpp
-VulkanExample::~VulkanExample() { 
+VulkanSwapchain::~VulkanSwapchain() {
   vkDestroyInstance(instance, NULL); 
 }
 ```