Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
29ba39fa
Commit
29ba39fa
authored
Jul 10, 2012
by
Matteo Bruni
Committed by
Alexandre Julliard
Jul 10, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dcompiler: Carry around both shader major and minor version.
parent
b8cdf2ee
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
compiler.c
dlls/d3dcompiler_43/compiler.c
+1
-1
d3dcompiler_private.h
dlls/d3dcompiler_43/d3dcompiler_private.h
+1
-1
hlsl.l
dlls/d3dcompiler_43/hlsl.l
+4
-3
hlsl.y
dlls/d3dcompiler_43/hlsl.y
+2
-1
No files found.
dlls/d3dcompiler_43/compiler.c
View file @
29ba39fa
...
...
@@ -503,7 +503,7 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co
TRACE
(
"Preprocessed shader source: %s
\n
"
,
debugstr_a
(
preproc_shader
));
FIXME
(
"Parse compilation target.
\n
"
);
shader
=
parse_hlsl_shader
(
preproc_shader
,
ST_VERTEX
,
2
,
entrypoint
,
&
messages
);
shader
=
parse_hlsl_shader
(
preproc_shader
,
ST_VERTEX
,
2
,
0
,
entrypoint
,
&
messages
);
if
(
messages
)
{
...
...
dlls/d3dcompiler_43/d3dcompiler_private.h
View file @
29ba39fa
...
...
@@ -874,7 +874,7 @@ struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) DECLSPEC_HIDDEN;
void
push_scope
(
struct
hlsl_parse_ctx
*
ctx
)
DECLSPEC_HIDDEN
;
BOOL
pop_scope
(
struct
hlsl_parse_ctx
*
ctx
)
DECLSPEC_HIDDEN
;
struct
hlsl_ir_function_decl
*
new_func_decl
(
const
char
*
name
,
struct
hlsl_type
*
return_type
,
struct
list
*
parameters
)
DECLSPEC_HIDDEN
;
struct
bwriter_shader
*
parse_hlsl_shader
(
const
char
*
text
,
enum
shader_type
type
,
DWORD
version
,
struct
bwriter_shader
*
parse_hlsl_shader
(
const
char
*
text
,
enum
shader_type
type
,
DWORD
major
,
DWORD
minor
,
const
char
*
entrypoint
,
char
**
messages
)
DECLSPEC_HIDDEN
;
const
char
*
debug_hlsl_type
(
const
struct
hlsl_type
*
type
)
DECLSPEC_HIDDEN
;
...
...
dlls/d3dcompiler_43/hlsl.l
View file @
29ba39fa
...
...
@@ -266,9 +266,10 @@ row_major {return KW_ROW_MAJOR; }
%%
struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD version, const char *entrypoint, char **messages);
struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD minor,
const char *entrypoint, char **messages);
struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD
version
,
struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD
major, DWORD minor
,
const char *entrypoint, char **messages)
{
struct bwriter_shader *ret = NULL;
...
...
@@ -277,7 +278,7 @@ struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type
buffer = hlsl__scan_string(text);
hlsl__switch_to_buffer(buffer);
ret = parse_hlsl(type,
version
, entrypoint, messages);
ret = parse_hlsl(type,
major, minor
, entrypoint, messages);
hlsl__delete_buffer(buffer);
return ret;
...
...
dlls/d3dcompiler_43/hlsl.y
View file @
29ba39fa
...
...
@@ -918,7 +918,8 @@ expr: assignment_expr
%%
struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD version, const char *entrypoint, char **messages)
struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD minor,
const char *entrypoint, char **messages)
{
struct hlsl_ir_function_decl *function;
struct hlsl_scope *scope, *next_scope;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment