mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-23 01:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Direct3D11: Avoid dependency on dxguid.lib

Browse source
This commit is contained in:
UnknownShadow200 2021-09-25 10:58:57 +10:00
parent c93465d065
commit d1ad64ee08
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Graphics_D3D11.c
View file

@ -14,7 +14,14 @@
#define COBJMACROS
#include <d3d11.h>
#pragma comment(lib, "d3d11.lib")
#pragma comment(lib, "dxguid.lib")
static const GUID guid_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0xb4, 0x48, 0x95, 0x35, 0xd3, 0x4f, 0x9c } };
// some generally useful debugging links
// https://docs.microsoft.com/en-us/visualstudio/debugger/graphics/visual-studio-graphics-diagnostics
// https://stackoverflow.com/questions/50591937/how-do-i-launch-the-hlsl-debugger-in-visual-studio-2017
// https://docs.microsoft.com/en-us/visualstudio/debugger/graphics/graphics-object-table?view=vs-2019
// Some generally useful background links
// https://gist.github.com/d7samurai/261c69490cce0620d0bfc93003cd1052
static int gfx_format = -1, depthBits;
static UINT gfx_stride;
@ -26,7 +33,6 @@ static IDXGIFactory1* dxgi_factory;
static IDXGISwapChain* swapchain;
struct ShaderDesc { const void* data; int len; };
// TODO RS_Init / RS_Free funcs
static void IA_Init(void);
static void IA_UpdateLayout(void);
static void VS_Init(void);
@ -592,7 +598,7 @@ static void OM_InitTargets(void) {
ID3D11Texture2D* pBackBuffer;
HRESULT hr;
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D11Texture2D, (void**)&pBackBuffer);
hr = IDXGISwapChain_GetBuffer(swapchain, 0, &guid_ID3D11Texture2D, (void**)&pBackBuffer);
if (hr) Logger_Abort2(hr, "Failed to get swapchain backbuffer");
hr = ID3D11Device_CreateRenderTargetView(device, pBackBuffer, NULL, &backbuffer);

1
src/_D3D11Shaders.h
View file

@ -21,6 +21,7 @@ struct OUTPUT_VERTEX {
OUTPUT_VERTEX main(INPUT_VERTEX input) {
OUTPUT_VERTEX output;
// https://stackoverflow.com/questions/16578765/hlsl-mul-variables-clarification
output.position = mul(mvpMatrix, float4(input.position, 1.0f));
#ifndef VS_COLOR_ONLY
output.coords = input.coords;