From 9713f651fefb6ca0ebaedb59ebb0797b7c5ee1eb Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Mon, 2 Aug 2004 18:24:40 +0000 Subject: [PATCH] Moved libtxc_dxt definitions into ddraw headers. --- dlls/ddraw/d3d_private.h | 8 -------- dlls/ddraw/ddraw_private.h | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/d3d_private.h b/dlls/ddraw/d3d_private.h index fcafc4b3b07..37b10b2bdbd 100644 --- a/dlls/ddraw/d3d_private.h +++ b/dlls/ddraw/d3d_private.h @@ -276,12 +276,4 @@ extern void multiply_matrix(LPD3DMATRIX,LPD3DMATRIX,LPD3DMATRIX); extern const float id_mat[16]; -typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT1)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel); -typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT3)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel); -typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT5)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel); - -extern FUNC_FETCH_2D_TEXEL_RGBA_DXT1 fetch_2d_texel_rgba_dxt1; -extern FUNC_FETCH_2D_TEXEL_RGBA_DXT3 fetch_2d_texel_rgba_dxt3; -extern FUNC_FETCH_2D_TEXEL_RGBA_DXT5 fetch_2d_texel_rgba_dxt5; - #endif /* __GRAPHICS_WINE_D3D_PRIVATE_H */ diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b7915ef990a..b583dae4d82 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -381,6 +381,14 @@ extern int _common_depth_to_pixelformat(DWORD depth,LPDIRECTDRAW ddraw); extern BOOL opengl_initialized; extern BOOL s3tc_initialized; +typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT1)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel); +typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT3)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel); +typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT5)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel); + +extern FUNC_FETCH_2D_TEXEL_RGBA_DXT1 fetch_2d_texel_rgba_dxt1; +extern FUNC_FETCH_2D_TEXEL_RGBA_DXT3 fetch_2d_texel_rgba_dxt3; +extern FUNC_FETCH_2D_TEXEL_RGBA_DXT5 fetch_2d_texel_rgba_dxt5; + /****************************************************************************** * Structure conversion (for thunks) */ -- 2.11.4.GIT