d3d10umd: Fix MSVC build.
Reviewed-by: Roland Scheidegger <sroland@vmware.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11973>
This commit is contained in:
parent
cf464affb4
commit
e69a82f988
|
@ -244,7 +244,7 @@ D3DKMTGetMultisampleMethodList(D3DKMT_GETMULTISAMPLEMETHODLIST *pData)
|
||||||
|
|
||||||
|
|
||||||
EXTERN_C NTSTATUS APIENTRY
|
EXTERN_C NTSTATUS APIENTRY
|
||||||
D3DKMTPresent(CONST D3DKMT_PRESENT *pData)
|
D3DKMTPresent(D3DKMT_PRESENT *pData)
|
||||||
{
|
{
|
||||||
LOG_UNSUPPORTED_ENTRYPOINT();
|
LOG_UNSUPPORTED_ENTRYPOINT();
|
||||||
return STATUS_NOT_IMPLEMENTED;
|
return STATUS_NOT_IMPLEMENTED;
|
||||||
|
@ -409,7 +409,7 @@ D3DKMTSetVidPnSourceOwner(CONST D3DKMT_SETVIDPNSOURCEOWNER *pData)
|
||||||
|
|
||||||
|
|
||||||
EXTERN_C NTSTATUS APIENTRY
|
EXTERN_C NTSTATUS APIENTRY
|
||||||
D3DKMTSetVidPnSourceOwner1(const void *pData)
|
D3DKMTSetVidPnSourceOwner1(CONST D3DKMT_SETVIDPNSOURCEOWNER1 *pData)
|
||||||
{
|
{
|
||||||
LOG_UNSUPPORTED_ENTRYPOINT();
|
LOG_UNSUPPORTED_ENTRYPOINT();
|
||||||
return STATUS_NOT_IMPLEMENTED;
|
return STATUS_NOT_IMPLEMENTED;
|
||||||
|
|
|
@ -43,12 +43,21 @@
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
||||||
#include "winddk/winddk_compat.h"
|
#include "winddk_compat.h"
|
||||||
|
|
||||||
//typedef LARGE_INTEGER PHYSICAL_ADDRESS;
|
//typedef LARGE_INTEGER PHYSICAL_ADDRESS;
|
||||||
//typedef __success(return >= 0) LONG NTSTATUS;
|
//typedef __success(return >= 0) LONG NTSTATUS;
|
||||||
|
|
||||||
#define D3D10DDI_MINOR_HEADER_VERSION 1
|
#define D3D10DDI_MINOR_HEADER_VERSION 2
|
||||||
|
|
||||||
|
/* Unfortunately WinDDK's d3d10umddi.h defines D3D10.x constants as global
|
||||||
|
* const variables instead of preprocessor defines, causing LINK to fail due
|
||||||
|
* to duplicate symbols. Include d3d10_1.h to avoid the issue.
|
||||||
|
*/
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#include <d3d10_1.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <d3d10umddi.h>
|
#include <d3d10umddi.h>
|
||||||
|
|
||||||
#include "Debug.h"
|
#include "Debug.h"
|
||||||
|
|
|
@ -392,7 +392,7 @@ Shader_parse_opcode(struct Shader_parser *parser,
|
||||||
if (opcode_is_extended) {
|
if (opcode_is_extended) {
|
||||||
/* NOTE: DECODE_IS_D3D10_SB_OPCODE_DOUBLE_EXTENDED is broken.
|
/* NOTE: DECODE_IS_D3D10_SB_OPCODE_DOUBLE_EXTENDED is broken.
|
||||||
*/
|
*/
|
||||||
assert(!((*curr & D3D10_SB_OPCODE_DOUBLE_EXTENDED_MASK) >> D3D10_SB_OPERAND_DOUBLE_EXTENDED_SHIFT));
|
assert(!((*curr & D3D10_SB_OPERAND_DOUBLE_EXTENDED_MASK) >> D3D10_SB_OPERAND_DOUBLE_EXTENDED_SHIFT));
|
||||||
|
|
||||||
switch (DECODE_D3D10_SB_EXTENDED_OPCODE_TYPE(*curr)) {
|
switch (DECODE_D3D10_SB_EXTENDED_OPCODE_TYPE(*curr)) {
|
||||||
case D3D10_SB_EXTENDED_OPCODE_EMPTY:
|
case D3D10_SB_EXTENDED_OPCODE_EMPTY:
|
||||||
|
|
|
@ -35,9 +35,6 @@
|
||||||
|
|
||||||
#include "DriverIncludes.h"
|
#include "DriverIncludes.h"
|
||||||
|
|
||||||
//#include "winddk/winddk_compat.h"
|
|
||||||
#include "winddk/d3d10tokenizedprogramformat.hpp"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue