Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2016-08-21 15:47:43 +0300
committerMikkel Krautz <mikkel@krautz.dk>2016-08-21 19:13:17 +0300
commit72f038e8a1836207571bf104875a4b792db1241b (patch)
treefd6a3868af5ed408db6f12977077069e58aed1eb /overlay/d3d10.cpp
parent1603d085510331cfe2f0f5dbe8ac2573597d2ef3 (diff)
overlay: remove use of d3dx9, d3dx10 and d3dx11.
Diffstat (limited to 'overlay/d3d10.cpp')
-rw-r--r--overlay/d3d10.cpp26
1 files changed, 19 insertions, 7 deletions
diff --git a/overlay/d3d10.cpp b/overlay/d3d10.cpp
index 6b91ebed0..df8f31875 100644
--- a/overlay/d3d10.cpp
+++ b/overlay/d3d10.cpp
@@ -6,7 +6,6 @@
#include "lib.h"
#include "overlay.hex"
#include <d3d10.h>
-#include <d3dx10.h>
#include <time.h>
D3D10Data *d3d10 = NULL;
@@ -27,9 +26,22 @@ typedef ULONG(__stdcall *ReleaseType)(ID3D10Device *);
#define HMODREF(mod, func) func##Type p##func = (func##Type) GetProcAddress(mod, #func)
+struct SimpleVec3 {
+ FLOAT x;
+ FLOAT y;
+ FLOAT z;
+ SimpleVec3(FLOAT _x, FLOAT _y, FLOAT _z) : x(_x), y(_y), z(_z) {}
+};
+
+struct SimpleVec2 {
+ FLOAT x;
+ FLOAT y;
+ SimpleVec2(FLOAT _x, FLOAT _y) : x(_x), y(_y) {}
+};
+
struct SimpleVertex {
- D3DXVECTOR3 Pos;
- D3DXVECTOR2 Tex;
+ SimpleVec3 Pos;
+ SimpleVec2 Tex;
};
class D10State: protected Pipe {
@@ -156,10 +168,10 @@ void D10State::setRect() {
// Create vertex buffer
SimpleVertex vertices[] = {
- { D3DXVECTOR3(left, top, 0.5f), D3DXVECTOR2(texl, text) },
- { D3DXVECTOR3(right, top, 0.5f), D3DXVECTOR2(texr, text) },
- { D3DXVECTOR3(right, bottom, 0.5f), D3DXVECTOR2(texr, texb) },
- { D3DXVECTOR3(left, bottom, 0.5f), D3DXVECTOR2(texl, texb) },
+ { SimpleVec3(left, top, 0.5f), SimpleVec2(texl, text) },
+ { SimpleVec3(right, top, 0.5f), SimpleVec2(texr, text) },
+ { SimpleVec3(right, bottom, 0.5f), SimpleVec2(texr, texb) },
+ { SimpleVec3(left, bottom, 0.5f), SimpleVec2(texl, texb) },
};
void *pData = NULL;