Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-31 06:58:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[D3DCOMPILER_43] Sync with Wine 3.0. CORE-14225

Browse source
This commit is contained in:
Amine Khaldi 2018-01-21 22:22:20 +01:00
parent d6ac0a71ad
commit a18d16dcb5
4 changed files with 371 additions and 390 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

743
dll/directx/wine/d3dcompiler_43/hlsl.tab.c
View file

File diff suppressed because it is too large Load diff

10
dll/directx/wine/d3dcompiler_43/hlsl.tab.h
View file

@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 3.0.2. */ /* A Bison parser, made by GNU Bison 3.0. */
/* Bison interface for Yacc-like parsers in C /* Bison interface for Yacc-like parsers in C
@ -30,8 +30,8 @@
This special exception was added by the Free Software Foundation in This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */ version 2.2 of Bison. */
#ifndef YY_HLSL_HLSL_TAB_H_INCLUDED #ifndef YY_HLSL_E_REACTOSSYNC3_0_GCC_DLL_DIRECTX_WINE_D3DCOMPILER_43_HLSL_TAB_H_INCLUDED
# define YY_HLSL_HLSL_TAB_H_INCLUDED # define YY_HLSL_E_REACTOSSYNC3_0_GCC_DLL_DIRECTX_WINE_D3DCOMPILER_43_HLSL_TAB_H_INCLUDED
/* Debug traces. */ /* Debug traces. */
#ifndef YYDEBUG #ifndef YYDEBUG
# define YYDEBUG 0 # define YYDEBUG 0
@ -155,7 +155,7 @@ extern int hlsl_debug;
typedef union YYSTYPE YYSTYPE; typedef union YYSTYPE YYSTYPE;
union YYSTYPE union YYSTYPE
{ {
#line 910 "hlsl.y" /* yacc.c:1909 */ #line 906 "hlsl.y" /* yacc.c:1909 */
struct hlsl_type *type; struct hlsl_type *type;
INT intval; INT intval;
@ -200,4 +200,4 @@ extern YYSTYPE hlsl_lval;
extern YYLTYPE hlsl_lloc; extern YYLTYPE hlsl_lloc;
int hlsl_parse (void); int hlsl_parse (void);
#endif /* !YY_HLSL_HLSL_TAB_H_INCLUDED */ #endif /* !YY_HLSL_E_REACTOSSYNC3_0_GCC_DLL_DIRECTX_WINE_D3DCOMPILER_43_HLSL_TAB_H_INCLUDED */

6
dll/directx/wine/d3dcompiler_43/hlsl.y
View file

@ -19,10 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
%{ %{
#include "config.h"
#include "wine/debug.h"
#include <stdio.h>
#include "d3dcompiler_private.h" #include "d3dcompiler_private.h"
@ -1151,7 +1147,7 @@ preproc_directive: PRE_LINE STRING
hlsl_ctx.line_no = $1; hlsl_ctx.line_no = $1;
if (strcmp($2, hlsl_ctx.source_file)) if (strcmp($2, hlsl_ctx.source_file))
new_array = d3dcompiler_realloc(hlsl_ctx.source_files, new_array = d3dcompiler_realloc(hlsl_ctx.source_files,
sizeof(*hlsl_ctx.source_files) * hlsl_ctx.source_files_count + 1); sizeof(*hlsl_ctx.source_files) * (hlsl_ctx.source_files_count + 1));
if (new_array) if (new_array)
{ {

2
media/doc/README.WINE
View file

@ -24,7 +24,7 @@ The following libraries are shared with Wine.
reactos/dll/directx/wine/amstream # Synced to Wine-3.0 reactos/dll/directx/wine/amstream # Synced to Wine-3.0
reactos/dll/directx/wine/d3d8 # Synced to Wine-3.0 reactos/dll/directx/wine/d3d8 # Synced to Wine-3.0
reactos/dll/directx/wine/d3d9 # Synced to Wine-3.0 reactos/dll/directx/wine/d3d9 # Synced to Wine-3.0
reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-2.16 reactos/dll/directx/wine/d3dcompiler_43 # Synced to Wine-3.0
reactos/dll/directx/wine/d3drm # Synced to WineStaging-2.16 reactos/dll/directx/wine/d3drm # Synced to WineStaging-2.16
reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-2.16 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-2.16
reactos/dll/directx/wine/d3dxof # Synced to WineStaging-2.9 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-2.9