changeset 5727:858ac97de356

RT-34233: D3D_DEBUG_INFO is not defined correctly Reviewed-by: kcr, ckyang
author vadim
date Mon, 18 Nov 2013 15:03:55 +0400
parents 9cbdb5c0d9e6
children e7bb12b9597a
files modules/graphics/src/main/native-prism-d3d/D3DLight.h modules/graphics/src/main/native-prism-d3d/D3DMesh.h modules/graphics/src/main/native-prism-d3d/D3DMeshView.h modules/graphics/src/main/native-prism-d3d/D3DPhongMaterial.h modules/graphics/src/main/native-prism-d3d/D3DPhongShader.cc modules/graphics/src/main/native-prism-d3d/D3DPhongShader.h modules/graphics/src/main/native-prism-d3d/D3DPhongShaderGen.cc modules/graphics/src/main/native-prism-d3d/D3DPipeline.h
diffstat 8 files changed, 2 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/native-prism-d3d/D3DLight.h	Sat Nov 16 11:50:45 2013 -0800
+++ b/modules/graphics/src/main/native-prism-d3d/D3DLight.h	Mon Nov 18 15:03:55 2013 +0400
@@ -26,9 +26,6 @@
 #ifndef D3DLIGHT_H
 #define D3DLIGHT_H
 
-#include <windows.h>
-#include <d3d9.h>
-#include <stddef.h>
 #include "D3DContext.h"
 
 // See     Light.h
--- a/modules/graphics/src/main/native-prism-d3d/D3DMesh.h	Sat Nov 16 11:50:45 2013 -0800
+++ b/modules/graphics/src/main/native-prism-d3d/D3DMesh.h	Mon Nov 18 15:03:55 2013 +0400
@@ -26,9 +26,6 @@
 #ifndef D3DMESH_H
 #define D3DMESH_H
 
-#include <windows.h>
-#include <d3d9.h>
-#include <stddef.h>
 #include "D3DContext.h"
 
 // See     MeshVbIb.h
--- a/modules/graphics/src/main/native-prism-d3d/D3DMeshView.h	Sat Nov 16 11:50:45 2013 -0800
+++ b/modules/graphics/src/main/native-prism-d3d/D3DMeshView.h	Mon Nov 18 15:03:55 2013 +0400
@@ -26,9 +26,6 @@
 #ifndef D3DMESHVIEW_H
 #define D3DMESHVIEW_H
 
-#include <windows.h>
-#include <d3d9.h>
-#include <stddef.h>
 #include "D3DContext.h"
 #include "D3DLight.h"
 #include "D3DMesh.h"
--- a/modules/graphics/src/main/native-prism-d3d/D3DPhongMaterial.h	Sat Nov 16 11:50:45 2013 -0800
+++ b/modules/graphics/src/main/native-prism-d3d/D3DPhongMaterial.h	Mon Nov 18 15:03:55 2013 +0400
@@ -26,9 +26,6 @@
 #ifndef D3DPHONGMATERIAL_H
 #define D3DPHONGMATERIAL_H
 
-#include <windows.h>
-#include <d3d9.h>
-#include <stddef.h>
 #include "D3DContext.h"
 
 // See MaterialPhong.h, MaterialPhongShaders.h
--- a/modules/graphics/src/main/native-prism-d3d/D3DPhongShader.cc	Sat Nov 16 11:50:45 2013 -0800
+++ b/modules/graphics/src/main/native-prism-d3d/D3DPhongShader.cc	Mon Nov 18 15:03:55 2013 +0400
@@ -24,8 +24,8 @@
  */
 
 #include <iostream>
+#include "D3DContext.h"
 #include "D3DPhongShader.h"
-#include "D3DContext.h"
 
 using std::cout;
 using std::cerr;
--- a/modules/graphics/src/main/native-prism-d3d/D3DPhongShader.h	Sat Nov 16 11:50:45 2013 -0800
+++ b/modules/graphics/src/main/native-prism-d3d/D3DPhongShader.h	Mon Nov 18 15:03:55 2013 +0400
@@ -25,9 +25,6 @@
 
 #ifndef D3DPHONGSHADER_H
 #define D3DPHONGSHADER_H
-#include <windows.h>
-#include <d3d9.h>
-#include <stddef.h>
 
 // VSR implies Vertex Shader Registers
 #define VSR_VIEWPROJMATRIX  0  // 4 total
--- a/modules/graphics/src/main/native-prism-d3d/D3DPhongShaderGen.cc	Sat Nov 16 11:50:45 2013 -0800
+++ b/modules/graphics/src/main/native-prism-d3d/D3DPhongShaderGen.cc	Mon Nov 18 15:03:55 2013 +0400
@@ -23,6 +23,7 @@
  * questions.
  */
 
+#include "D3DPipeline.h"
 #include "D3DPhongShader.h"
 
 #define shader(name) ShaderFunction name() { static
--- a/modules/graphics/src/main/native-prism-d3d/D3DPipeline.h	Sat Nov 16 11:50:45 2013 -0800
+++ b/modules/graphics/src/main/native-prism-d3d/D3DPipeline.h	Mon Nov 18 15:03:55 2013 +0400
@@ -33,7 +33,6 @@
     #define D3D_DEBUG_INFO
 #endif
 
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <d3d9.h>
 #include <stddef.h>