reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 22:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wined3d: Make some functions static.

Browse Source
This commit is contained in:
Henri Verbeet 2010-04-04 19:51:39 +02:00 committed by Alexandre Julliard
parent fcee05586b
commit 224c376528
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/wined3d/device.c
View File

@ -6250,9 +6250,9 @@ static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, const WINED3DPRE
return FALSE;
}
void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_iface) {
static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl *swapchain)
{
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) swapchain_iface;
const struct wined3d_gl_info *gl_info;
struct wined3d_context *context;
IWineD3DBaseShaderImpl *shader;
@ -6294,9 +6294,9 @@ void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_
swapchain->num_contexts = 0;
}
HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_iface) {
static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChainImpl *swapchain)
{
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) swapchain_iface;
struct wined3d_context *context;
HRESULT hr;
IWineD3DSurfaceImpl *target;
@ -6453,7 +6453,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE
IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->updateStateBlock);
IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->stateBlock);
delete_opengl_contexts(iface, (IWineD3DSwapChain *) swapchain);
delete_opengl_contexts(iface, swapchain);
if(pPresentationParameters->Windowed) {
mode.Width = swapchain->orig_width;
@ -6581,7 +6581,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE
}
}
hr = create_primary_opengl_context(iface, (IWineD3DSwapChain *) swapchain);
hr = create_primary_opengl_context(iface, swapchain);
IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain);
/* All done. There is no need to reload resources or shaders, this will happen automatically on the

12
dlls/wined3d/directx.c
View File

@ -1247,7 +1247,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s
enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info,
static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info,
const char *gl_renderer, unsigned int *vidmem)
{
/* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more
@ -1491,7 +1491,7 @@ enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *
}
enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_info *gl_info,
static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_info *gl_info,
const char *gl_renderer, unsigned int *vidmem)
{
/* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx
@ -1647,7 +1647,7 @@ enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_info *gl_
}
enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_info *gl_info,
static enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_info *gl_info,
const char *gl_renderer, unsigned int *vidmem)
{
if (strstr(gl_renderer, "X3100"))
@ -1673,7 +1673,7 @@ enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_info *g
}
enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info *gl_info,
static enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info *gl_info,
const char *gl_renderer, unsigned int *vidmem)
{
/* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx
@ -1882,7 +1882,7 @@ enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info *gl_in
}
enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info,
static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info,
const char *gl_renderer, unsigned int *vidmem)
{
FIXME_(d3d_caps)("Card selection not handled for Mesa Nouveau driver\n");
@ -1893,7 +1893,7 @@ enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl
return CARD_NVIDIA_RIVA_128;
}
enum wined3d_pci_device select_card_intel_mesa(const struct wined3d_gl_info *gl_info,
static enum wined3d_pci_device select_card_intel_mesa(const struct wined3d_gl_info *gl_info,
const char *gl_renderer, unsigned int *vidmem)
{
FIXME_(d3d_caps)("Card selection not handled for Mesa Intel driver\n");

3
dlls/wined3d/wined3d_private.h
View File

@ -1217,9 +1217,6 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DEC
void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN;
void context_surface_update(struct wined3d_context *context, IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN;
void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain) DECLSPEC_HIDDEN;
HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain) DECLSPEC_HIDDEN;
/* Macros for doing basic GPU detection based on opengl capabilities */
#define WINE_D3D6_CAPABLE(gl_info) (gl_info->supported[ARB_MULTITEXTURE])
#define WINE_D3D7_CAPABLE(gl_info) (gl_info->supported[ARB_TEXTURE_COMPRESSION] && gl_info->supported[ARB_TEXTURE_CUBE_MAP] && gl_info->supported[ARB_TEXTURE_ENV_DOT3])