wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Write empty SM1 shaders.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-04-15 19:03:43 -05:00 committed by Alexandre Julliard
parent 12b297b8cc
commit 44816403f1
5 changed files with 178 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -19,6 +19,7 @@ vkd3d_public_headers = \
include/vkd3d.h \
include/vkd3d_d3d12.h \
include/vkd3d_d3d12sdklayers.h \
include/vkd3d_d3d9types.h \
include/vkd3d_d3dcommon.h \
include/vkd3d_d3dcompiler.h \
include/vkd3d_dxgibase.h \

121
include/vkd3d_d3d9types.h Normal file
View File

@ -0,0 +1,121 @@
/*
* Copyright 2002-2003 Jason Edmeades
* Copyright 2002-2003 Raphael Junqueira
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __VKD3D_D3D9TYPES_H
#define __VKD3D_D3D9TYPES_H
#ifndef _d3d9TYPES_H_
#define D3DPS_VERSION(major, minor) (0xffff0000 | ((major) << 8) | (minor))
#define D3DVS_VERSION(major, minor) (0xfffe0000 | ((major) << 8) | (minor))
typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE
{
D3DSIO_NOP = 0x00,
D3DSIO_MOV = 0x01,
D3DSIO_ADD = 0x02,
D3DSIO_SUB = 0x03,
D3DSIO_MAD = 0x04,
D3DSIO_MUL = 0x05,
D3DSIO_RCP = 0x06,
D3DSIO_RSQ = 0x07,
D3DSIO_DP3 = 0x08,
D3DSIO_DP4 = 0x09,
D3DSIO_MIN = 0x0a,
D3DSIO_MAX = 0x0b,
D3DSIO_SLT = 0x0c,
D3DSIO_SGE = 0x0d,
D3DSIO_EXP = 0x0e,
D3DSIO_LOG = 0x0f,
D3DSIO_LIT = 0x10,
D3DSIO_DST = 0x11,
D3DSIO_LRP = 0x12,
D3DSIO_FRC = 0x13,
D3DSIO_M4x4 = 0x14,
D3DSIO_M4x3 = 0x15,
D3DSIO_M3x4 = 0x16,
D3DSIO_M3x3 = 0x17,
D3DSIO_M3x2 = 0x18,
D3DSIO_CALL = 0x19,
D3DSIO_CALLNZ = 0x1a,
D3DSIO_LOOP = 0x1b,
D3DSIO_RET = 0x1c,
D3DSIO_ENDLOOP = 0x1d,
D3DSIO_LABEL = 0x1e,
D3DSIO_DCL = 0x1f,
D3DSIO_POW = 0x20,
D3DSIO_CRS = 0x21,
D3DSIO_SGN = 0x22,
D3DSIO_ABS = 0x23,
D3DSIO_NRM = 0x24,
D3DSIO_SINCOS = 0x25,
D3DSIO_REP = 0x26,
D3DSIO_ENDREP = 0x27,
D3DSIO_IF = 0x28,
D3DSIO_IFC = 0x29,
D3DSIO_ELSE = 0x2a,
D3DSIO_ENDIF = 0x2b,
D3DSIO_BREAK = 0x2c,
D3DSIO_BREAKC = 0x2d,
D3DSIO_MOVA = 0x2e,
D3DSIO_DEFB = 0x2f,
D3DSIO_DEFI = 0x30,
D3DSIO_TEXCOORD = 0x40,
D3DSIO_TEXKILL = 0x41,
D3DSIO_TEX = 0x42,
D3DSIO_TEXBEM = 0x43,
D3DSIO_TEXBEML = 0x44,
D3DSIO_TEXREG2AR = 0x45,
D3DSIO_TEXREG2GB = 0x46,
D3DSIO_TEXM3x2PAD = 0x47,
D3DSIO_TEXM3x2TEX = 0x48,
D3DSIO_TEXM3x3PAD = 0x49,
D3DSIO_TEXM3x3TEX = 0x4a,
D3DSIO_TEXM3x3DIFF = 0x4b,
D3DSIO_TEXM3x3SPEC = 0x4c,
D3DSIO_TEXM3x3VSPEC = 0x4d,
D3DSIO_EXPP = 0x4e,
D3DSIO_LOGP = 0x4f,
D3DSIO_CND = 0x50,
D3DSIO_DEF = 0x51,
D3DSIO_TEXREG2RGB = 0x52,
D3DSIO_TEXDP3TEX = 0x53,
D3DSIO_TEXM3x2DEPTH = 0x54,
D3DSIO_TEXDP3 = 0x55,
D3DSIO_TEXM3x3 = 0x56,
D3DSIO_TEXDEPTH = 0x57,
D3DSIO_CMP = 0x58,
D3DSIO_BEM = 0x59,
D3DSIO_DP2ADD = 0x5a,
D3DSIO_DSX = 0x5b,
D3DSIO_DSY = 0x5c,
D3DSIO_TEXLDD = 0x5d,
D3DSIO_SETP = 0x5e,
D3DSIO_TEXLDL = 0x5f,
D3DSIO_BREAKP = 0x60,
D3DSIO_PHASE = 0xfffd,
D3DSIO_COMMENT = 0xfffe,
D3DSIO_END = 0xffff,
D3DSIO_FORCE_DWORD = 0x7fffffff,
} D3DSHADER_INSTRUCTION_OPCODE_TYPE;
#endif /* _d3d9TYPES_H_ */
#endif /* __VKD3D_D3D9TYPES_H */

2
libs/vkd3d-shader/hlsl.c
View File

@ -1671,7 +1671,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d
hlsl_error(&ctx, entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC,
"Entry point \"%s\" is missing a return value semantic.", entry_point);
ret = hlsl_emit_dxbc(&ctx, entry_func);
ret = hlsl_emit_dxbc(&ctx, entry_func, dxbc);
hlsl_ctx_cleanup(&ctx);
return ret;

3
libs/vkd3d-shader/hlsl.h
View File

@ -530,7 +530,8 @@ bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var
void hlsl_dump_function(const struct hlsl_ir_function_decl *func) DECLSPEC_HIDDEN;
int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) DECLSPEC_HIDDEN;
int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func,
struct vkd3d_shader_code *out) DECLSPEC_HIDDEN;
void hlsl_free_instr(struct hlsl_ir_node *node) DECLSPEC_HIDDEN;
void hlsl_free_instr_list(struct list *list) DECLSPEC_HIDDEN;

55
libs/vkd3d-shader/hlsl_codegen.c
View File

@ -20,6 +20,7 @@
#include "hlsl.h"
#include <stdio.h>
#include "vkd3d_d3d9types.h"
/* Split uniforms into two variables representing the constant and temp
* registers, and copy the former to the latter, so that writes to uniforms
@ -873,7 +874,53 @@ static void allocate_temp_registers(struct hlsl_ir_function_decl *entry_func)
allocate_temp_registers_recurse(entry_func->body, &liveness);
}
int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func)
struct bytecode_buffer
{
uint32_t *data;
size_t count, size;
int status;
};
static void put_dword(struct bytecode_buffer *buffer, uint32_t value)
{
if (buffer->status)
return;
if (!vkd3d_array_reserve((void **)&buffer->data, &buffer->size, buffer->count + 1, sizeof(*buffer->data)))
{
buffer->status = VKD3D_ERROR_OUT_OF_MEMORY;
return;
}
buffer->data[buffer->count++] = value;
}
static uint32_t sm1_version(enum vkd3d_shader_type type, unsigned int major, unsigned int minor)
{
if (type == VKD3D_SHADER_TYPE_VERTEX)
return D3DVS_VERSION(major, minor);
else
return D3DPS_VERSION(major, minor);
}
static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func,
struct vkd3d_shader_code *out)
{
struct bytecode_buffer buffer = {0};
int ret;
put_dword(&buffer, sm1_version(ctx->profile->type, ctx->profile->major_version, ctx->profile->minor_version));
put_dword(&buffer, D3DSIO_END);
if (!(ret = buffer.status))
{
out->code = buffer.data;
out->size = buffer.count * sizeof(uint32_t);
}
return ret;
}
int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out)
{
struct hlsl_ir_var *var;
@ -916,5 +963,9 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun
if (ctx->failed)
return VKD3D_ERROR_INVALID_SHADER;
return VKD3D_ERROR_NOT_IMPLEMENTED;
if (ctx->profile->major_version < 4)
return write_sm1_shader(ctx, entry_func, out);
else
return VKD3D_ERROR_NOT_IMPLEMENTED;
}