Stage 1 of rename

TODO: re-enable glave build, advance API for glave

v2: get rid of outdated code in tri introduced by rebase
    rename wsi_null.c (olv)

Author: courtney-lunarg

.gitignore

@@ -8,18 +8,6 @@ XGLConfig.h
 *.so.*
 icd/common/libicd.a
 icd/intel/intel_gpa.c
-loader/dispatch.c
-loader/table_ops.h
-tests/xgl_image_tests
-tests/xgl_render_tests
-tests/xglbase
-tests/xglinfo
-layers/xgl_dispatch_table_helper.h
-layers/xgl_enum_string_helper.h
-layers/xgl_generic_intercept_proc_helper.h
-layers/xgl_struct_string_helper.h
-layers/xgl_struct_wrappers.cpp
-layers/xgl_struct_wrappers.h
 _out64
 out32/*
 out64/*
@@ -36,3 +24,5 @@ libs/Win32/Debug/*
 *.vcxproj
 *.sdf
 *.filters
+build
+dbuild

BUILD.md

@@ -68,38 +68,38 @@ The standard build process builds the icd, the icd loader and all the tests.
 
 Example debug build:
 ```
-cd YOUR_DEV_DIRECTORY  # cd to the root of the xgl git repository
+cd YOUR_DEV_DIRECTORY  # cd to the root of the vk git repository
 export KHRONOS_ACCOUNT_NAME= <subversion login name for svn checkout of BIL>
 ./update_external_sources.sh  # fetches and builds glslang, llvm, LunarGLASS, and BIL
 cmake -H. -Bdbuild -DCMAKE_BUILD_TYPE=Debug
 cd dbuild
 make
 ```
 
-To run XGL programs you must tell the icd loader where to find the libraries. Set the
-environment variable LIBXGL_DRIVERS_PATH to the driver path. For example:
+To run VK programs you must tell the icd loader where to find the libraries. Set the
+environment variable LIBVK_DRIVERS_PATH to the driver path. For example:
 ```
-export LIBXGL_DRIVERS_PATH=$PWD/icd/intel
+export LIBVK_DRIVERS_PATH=$PWD/icd/intel
 ```
 
-To enable debug and validation layers with your XGL programs you must tell the icd loader
-where to find the layer libraries. Set the environment variable LIBXGL_LAYERS_PATH to
-the layer folder and indicate the layers you want loaded via LIBXGL_LAYER_NAMES.
+To enable debug and validation layers with your VK programs you must tell the icd loader
+where to find the layer libraries. Set the environment variable LIBVK_LAYERS_PATH to
+the layer folder and indicate the layers you want loaded via LIBVK_LAYER_NAMES.
 For example, to enable the APIDump and DrawState layers, do:
 ```
-export LIBXGL_LAYERS_PATH=$PWD/layers
-export LIBXGL_LAYER_NAMES=APIDump:DrawState
+export LIBVK_LAYERS_PATH=$PWD/layers
+export LIBVK_LAYER_NAMES=APIDump:DrawState
 ```
 
 ##Linux Test
 
 The test executibles can be found in the dbuild/tests directory. The tests use the Google
 gtest infrastructure. Tests available so far:
-- xglinfo: Report GPU properties
-- xglbase: Test basic entry points
-- xgl_blit_tests: Test XGL Blits (copy, clear, and resolve)
-- xgl_image_tests: Test XGL image related calls needed by render_test
-- xgl_render_tests: Render a single triangle with XGL. Triangle will be in a .ppm in
+- vkinfo: Report GPU properties
+- vkbase: Test basic entry points
+- vk_blit_tests: Test VK Blits (copy, clear, and resolve)
+- vk_image_tests: Test VK image related calls needed by render_test
+- vk_render_tests: Render a single triangle with VK. Triangle will be in a .ppm in
 the current directory at the end of the test.
 
 ##Linux Demos
@@ -162,23 +162,23 @@ Cygwin is used in order to obtain a local copy of the Git repository, and to run
 
 Example debug build:
 ```
-cd GL-Next  # cd to the root of the xgl git repository
+cd GL-Next  # cd to the root of the vk git repository
 mkdir _out64
 cd _out64
 cmake -G "Visual Studio 12 Win64" -DCMAKE_BUILD_TYPE=Debug ..
 ```
 
-At this point, you can use Windows Explorer to launch Visual Studio by double-clicking on the "XGL.sln" file in the _out64 folder.  Once Visual Studio comes up, you can select "Debug" or "Release" from a drop-down list.  You can start a build with either the menu (Build->Build Solution), or a keyboard shortcut (Ctrl+Shift+B).  As part of the build process, Python scripts will create additional Visual Studio files and projects, along with additional source files.  All of these auto-generated files are under the "_out64" folder.
+At this point, you can use Windows Explorer to launch Visual Studio by double-clicking on the "VK.sln" file in the _out64 folder.  Once Visual Studio comes up, you can select "Debug" or "Release" from a drop-down list.  You can start a build with either the menu (Build->Build Solution), or a keyboard shortcut (Ctrl+Shift+B).  As part of the build process, Python scripts will create additional Visual Studio files and projects, along with additional source files.  All of these auto-generated files are under the "_out64" folder.
 
-XGL programs must be able to find and use the XGL.dll libary. Make sure it is either installed in the C:\Windows\System32 folder, or the PATH enviroment variable includes the folder that it is located in.
+VK programs must be able to find and use the VK.dll libary. Make sure it is either installed in the C:\Windows\System32 folder, or the PATH enviroment variable includes the folder that it is located in.
 
-To run XGL programs you must have an appropriate ICD (installable client driver) that is either installed in the C:\Windows\System32 folder, or pointed to by the registry and/or an environment variable:
+To run VK programs you must have an appropriate ICD (installable client driver) that is either installed in the C:\Windows\System32 folder, or pointed to by the registry and/or an environment variable:
 
 - Registry:
   - Root Key: HKEY_LOCAL_MACHINE
-  - Key: "SOFTWARE\XGL"
-  - Value: "XGL_DRIVERS_PATH" (semi-colon-delimited set of folders to look for ICDs)
-- Environment Variable: "XGL_DRIVERS_PATH" (semi-colon-delimited set of folders to look for ICDs)
+  - Key: "SOFTWARE\VK"
+  - Value: "VK_DRIVERS_PATH" (semi-colon-delimited set of folders to look for ICDs)
+- Environment Variable: "VK_DRIVERS_PATH" (semi-colon-delimited set of folders to look for ICDs)
 
 Note: If both the registry value and environment variable are used, they are concatenated into a new semi-colon-delimited list of folders.
 
@@ -188,24 +188,24 @@ Note: Environment variables on Windows cannot be set with Cygwin, but must be se
 - Within the search box, type "environment variable" and click on "Edit the system environment variables" (or navigate there via "System and Security->System->Advanced system settings").
 - This will launch a window with several tabs, one of which is "Advanced".  Click on the "Environment Variables..." button.
 - For either "User variables" or "System variables" click "New...".
-- Enter "XGL_DRIVERS_PATH" as the variable name, and an appropriate Windows path to where your driver DLL is (e.g. C:\Users\username\GL-Next\_out64\icd\drivername\Debug).
+- Enter "VK_DRIVERS_PATH" as the variable name, and an appropriate Windows path to where your driver DLL is (e.g. C:\Users\username\GL-Next\_out64\icd\drivername\Debug).
 
 It is possible to specify multiple icd folders.  Simply use a semi-colon (i.e. ";") to separate folders in the environment variable.
 
-The icd loader searches in all of the folders for files that are named "XGL_*.dll" (e.g. "XGL_foo.dll").  It attempts to dynamically load these files, and look for appropriate functions.
+The icd loader searches in all of the folders for files that are named "VK_*.dll" (e.g. "VK_foo.dll").  It attempts to dynamically load these files, and look for appropriate functions.
 
-To enable debug and validation layers with your XGL programs you must tell the icd loader
+To enable debug and validation layers with your VK programs you must tell the icd loader
 where to find the layer libraries, and which ones you desire to use.  The default folder for layers is C:\Windows\System32. Again, this can be pointed to by the registry and/or an environment variable:
 
 - Registry:
   - Root Key: HKEY_LOCAL_MACHINE
-  - Key: "System\XGL"
-  - Value: "XGL_LAYERS_PATH" (semi-colon-delimited set of folders to look for layers)
-  - Value: "XGL_LAYER_NAMES" (semi-colon-delimited list of layer names)
+  - Key: "System\VK"
+  - Value: "VK_LAYERS_PATH" (semi-colon-delimited set of folders to look for layers)
+  - Value: "VK_LAYER_NAMES" (semi-colon-delimited list of layer names)
 - Environment Variables:
-  - "XGL_LAYERS_PATH" (semi-colon-delimited set of folders to look for layers)
-  - "XGL_LAYER_NAMES" (semi-colon-delimited list of layer names)
+  - "VK_LAYERS_PATH" (semi-colon-delimited set of folders to look for layers)
+  - "VK_LAYER_NAMES" (semi-colon-delimited list of layer names)
 
 Note: If both the registry value and environment variable are used, they are concatenated into a new semi-colon-delimited list.
 
-The icd loader searches in all of the folders for files that are named "XGLLayer*.dll" (e.g. "XGLLayerParamChecker.dll").  It attempts to dynamically load these files, and look for appropriate functions.
+The icd loader searches in all of the folders for files that are named "VKLayer*.dll" (e.g. "VKLayerParamChecker.dll").  It attempts to dynamically load these files, and look for appropriate functions.

README.md

@@ -1,13 +1,13 @@
-# Explicit GL (XGL) Ecosystem Components
+# Explicit GL (VK) Ecosystem Components
 *Version 0.8, 04 Feb 2015*
 
-This project provides *open source* tools for XGL Developers.
+This project provides *open source* tools for VK Developers.
 
 ## Introduction
 
-XGL is an Explicit API, enabling direct control over how GPUs actually work. No validation, shader recompilation, memory management or synchronization is done inside an XGL driver. Applications have full control and responsibility. Any errors in how XGL is used are likely to result in a crash. This project provides layered utility libraries to ease development and help guide developers to proven safe patterns.
+VK is an Explicit API, enabling direct control over how GPUs actually work. No validation, shader recompilation, memory management or synchronization is done inside an VK driver. Applications have full control and responsibility. Any errors in how VK is used are likely to result in a crash. This project provides layered utility libraries to ease development and help guide developers to proven safe patterns.
 
-New with XGL in an extensible layered architecture that enables significant innovation in tools:
+New with VK in an extensible layered architecture that enables significant innovation in tools:
 - Cross IHV support enables tools vendors to plug into a common, extensible layer architecture
 - Layered tools during development enable validating, debugging and profiling without production performance impact
 - Modular validation architecture encourages many fine-grained layers--and new layers can be added easily
@@ -19,9 +19,9 @@ insights into the specification as we approach an alpha header, and to assists t
 demos for GDC.
 
 The following components are available:
-- XGL Library and header files, which include:
+- VK Library and header files, which include:
     - [*ICD Loader*](loader) and [*Layer Manager*](layers/README.md)
-    - Snapshot of *XGL* and *BIL* header files from [*Khronos*](www.khronos.org)
+    - Snapshot of *VK* and *BIL* header files from [*Khronos*](www.khronos.org)
 
 - [*GLAVE Debugger*](tools/glave)
 
@@ -33,7 +33,7 @@ The following components are available:
 
 ## New
 
-- Updated loader, driver, demos, tests and many tools to use "alpha" xgl.h (~ version 47).
+- Updated loader, driver, demos, tests and many tools to use "alpha" vulkan.h (~ version 47).
   Supports new resource binding model, memory allocation, pixel FORMATs and
   other updates.
   APIDump layer is working with these new API elements.
@@ -44,9 +44,9 @@ The following components are available:
 
 ## Prior updates
 
-- XGL API trace and capture tools. See tools/glave/README.md for details.
+- VK API trace and capture tools. See tools/glave/README.md for details.
 - Sample driver now supports multiple render targets. Added TriangleMRT to test that functionality.
-- Added XGL_SLOT_SHADER_TEXTURE_RESOURCE to xgl.h as a descriptor slot type to work around confusion in GLSL
+- Added VK_SLOT_SHADER_TEXTURE_RESOURCE to vulkan.h as a descriptor slot type to work around confusion in GLSL
   between textures and buffers as shader resources.
 - Misc. fixes for layers and Intel sample driver
 - Added mutex to APIDump, APIDumpFile and DrawState to prevent apparent threading issues using printf
@@ -70,24 +70,24 @@ Information on how to enable the various Debug and Validation layers is in
 
 ## References
 This version of the components are written based on the following preliminary specs and proposals:
-- [**XGL Programers Reference**, 1 Jul 2014](https://cvs.khronos.org/svn/repos/oglc/trunk/nextgen/proposals/AMD/Explicit%20GL%20Programming%20Guide%20and%20API%20Reference.pdf)
+- [**VK Programers Reference**, 1 Jul 2014](https://cvs.khronos.org/svn/repos/oglc/trunk/nextgen/proposals/AMD/Explicit%20GL%20Programming%20Guide%20and%20API%20Reference.pdf)
 - [**BIL**, revision 29](https://cvs.khronos.org/svn/repos/oglc/trunk/nextgen/proposals/BIL/Specification/BIL.html)
 
 ## License
 This work is intended to be released as open source under a BSD-style
-license once the XGL specification is public. Until that time, this work
-is covered by the Khronos NDA governing the details of the XGL API.
+license once the VK specification is public. Until that time, this work
+is covered by the Khronos NDA governing the details of the VK API.
 
 ## Acknowledgements
 While this project is being developed by LunarG, Inc; there are many other
 companies and individuals making this possible: Valve Software, funding
 project development; Intel Corporation, providing full hardware specifications
-and valuable technical feedback; AMD, providing XGL spec editor contributions;
+and valuable technical feedback; AMD, providing VK spec editor contributions;
 ARM, contributing a Chairman for this working group within Khronos; Nvidia,
 providing an initial co-editor for the spec; Qualcomm for picking up the
 co-editor's chair; and Khronos, for providing hosting within GitHub.
 
 ## Contact
 If you have questions or comments about this driver; or you would like to contribute
-directly to this effort, please contact us at XGL@LunarG.com; or if you prefer, via
+directly to this effort, please contact us at VK@LunarG.com; or if you prefer, via
 the GL Common mailing list: [email protected]

demos/CMakeLists.txt

@@ -16,8 +16,8 @@ file(GLOB TEXTURES
   )
 file(COPY ${TEXTURES} DESTINATION ${CMAKE_BINARY_DIR}/demos)
 
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DXGL_PROTOTYPES")
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVK_PROTOTYPES")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_PROTOTYPES")
 
 if(WIN32)
     set (LIBRARIES "XGL")