ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx10: Implement D3DX10CompileFromMemory. 

Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Andrey Gusev 2016-06-29 11:19:56 +03:00 committed by Alexandre Julliard
parent 0524963d7d
commit 40c2b73573
4 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3dx10_43/Makefile.in
View File

@ -1,8 +1,9 @@
MODULE = d3dx10_43.dll
IMPORTLIB = d3dx10
IMPORTS = d3d10_1 dxguid
IMPORTS = d3d10_1 d3dcompiler dxguid
C_SRCS = \
async.c \
d3dx10_43_main.c
RC_SRCS = version.rc

45
dlls/d3dx10_43/async.c Normal file
View File

@ -0,0 +1,45 @@
/*
* Copyright 2016 Andrey Gusev
*
* 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
*/
#include "config.h"
#include "wine/port.h"
#include "d3d10_1.h"
#include "d3dx10.h"
#include "d3dx10core.h"
#include "d3dcompiler.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const char *filename,
const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point,
const char *target, UINT sflags, UINT eflags, ID3DX10ThreadPump *pump, ID3D10Blob **shader,
ID3D10Blob **error_messages, HRESULT *hresult)
{
TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, "
"sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n",
debugstr_a(data), data_size, debugstr_a(filename), defines, include, entry_point,
debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult);
if (pump)
FIXME("Unimplemented ID3DX10ThreadPump handling.\n");
return D3DCompile(data, data_size, filename, defines, include, entry_point, target,
sflags, eflags, shader, error_messages);
}

2
dlls/d3dx10_43/d3dx10_43.spec
View File

@ -2,7 +2,7 @@
@ stdcall D3DX10CheckVersion(long long)
@ stub D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr)
@ stub D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr)
@ stub D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr)
@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr)
@ stub D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr)
@ stub D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr)
@ stub D3DX10ComputeNormalMap(ptr long long long ptr)

6
include/d3dx10async.h
View File

@ -19,6 +19,12 @@
#ifndef __D3DX10ASYNC_H__
#define __D3DX10ASYNC_H__
#include "d3dx10.h"
HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const char *filename,
const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point,
const char *target, UINT sflags, UINT eflags, ID3DX10ThreadPump *pump, ID3D10Blob **shader,
ID3D10Blob **error_messages, HRESULT *hresult);
HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines,
ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device,