Rearranged header files (introducing nv2a_regs.h)

Cxbx-Reloaded · Oct 5, 2018 · 28c672a · 28c672a
1 parent 8584f09
commit 28c672a
Show file tree

Hide file tree

Showing 9 changed files with 2,360 additions and 2,324 deletions.
diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj
@@ -293,6 +293,7 @@
     <ClInclude Include="..\..\src\devices\video\nv2a_debug.h" />
     <ClInclude Include="..\..\src\devices\video\nv2a_int.h" />
     <ClInclude Include="..\..\src\devices\video\nv2a_psh.h" />
+    <ClInclude Include="..\..\src\devices\video\nv2a_regs.h" />
     <ClInclude Include="..\..\src\devices\video\nv2a_shaders.h" />
     <ClInclude Include="..\..\src\devices\video\nv2a_shaders_common.h" />
     <ClInclude Include="..\..\src\devices\video\nv2a_vsh.h" />

diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters
@@ -808,4 +808,9 @@
     <Image Include="..\..\resource\Cxbx-R.ico" />
     <Image Include="..\..\resource\Logo-License-CC4.bmp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\devices\video\nv2a_regs.h">
+      <Filter>Hardware\Video</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
diff --git a/src/devices/video/nv2a.cpp b/src/devices/video/nv2a.cpp
@@ -30,15 +30,15 @@
 // *
 // *  (c) 2002-2003 Aaron Robinson <caustik@caustik.com>
 // * 
-// *  nv2a.cpp is heavily based on code from XQEMU
-// *  Copyright(c) 2012 espes
-// *  Copyright(c) 2015 Jannik Vogel
+// *  This file is heavily based on code from XQEMU
+// *  https://github.com/xqemu/xqemu/blob/master/hw/xbox/nv2a/nv2a.c
+// *  Copyright (c) 2012 espes
+// *  Copyright (c) 2015 Jannik Vogel
 // *  Copyright (c) 2018 Matt Borgerson
 // *
-// *  https://github.com/espes/xqemu/blob/xbox/hw/xbox/nv2a.c
-// *
-// *  (c) 2016-2018 Luke Usher <luke.usher@outlook.com>
-// *  (c) 2017-2018 Patrick van Logchem <pvanlogchem@gmail.com>
+// *  Contributions for Cxbx-Reloaded
+// *  Copyright (c) 2017-2018 Luke Usher <luke.usher@outlook.com>
+// *  Copyright (c) 2018 Patrick van Logchem <pvanlogchem@gmail.com>
 // *
 // *  All rights reserved
 // *
@@ -101,6 +101,9 @@ struct _GError
 
 #include "CxbxKrnl/gloffscreen/glextensions.h" // for glextensions_init
 
+GLuint create_gl_shader(GLenum gl_shader_type,
+	const char *code,
+	const char *name); // forward to nv2a_shaders.cpp
 
 static void update_irq(NV2AState *d)
 {