Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
e8ac9bbd
Commit
e8ac9bbd
authored
May 25, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
May 25, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of GLINFO_LOCATION.
parent
b5cec576
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
1 addition
and
30 deletions
+1
-30
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+0
-3
ati_fragment_shader.c
dlls/wined3d/ati_fragment_shader.c
+0
-2
buffer.c
dlls/wined3d/buffer.c
+0
-2
context.c
dlls/wined3d/context.c
+0
-2
device.c
dlls/wined3d/device.c
+0
-1
directx.c
dlls/wined3d/directx.c
+0
-1
drawprim.c
dlls/wined3d/drawprim.c
+0
-1
glsl_shader.c
dlls/wined3d/glsl_shader.c
+0
-2
nvidia_texture_shader.c
dlls/wined3d/nvidia_texture_shader.c
+0
-2
query.c
dlls/wined3d/query.c
+0
-1
state.c
dlls/wined3d/state.c
+0
-3
surface.c
dlls/wined3d/surface.c
+0
-2
surface_base.c
dlls/wined3d/surface_base.c
+0
-3
swapchain.c
dlls/wined3d/swapchain.c
+0
-2
volume.c
dlls/wined3d/volume.c
+0
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/arb_program_shader.c
View file @
e8ac9bbd
...
...
@@ -39,8 +39,6 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_constants);
WINE_DECLARE_DEBUG_CHANNEL
(
d3d_caps
);
WINE_DECLARE_DEBUG_CHANNEL
(
d3d
);
#define GLINFO_LOCATION (*gl_info)
/* Extract a line. Note that this modifies the source string. */
static
char
*
get_line
(
char
**
ptr
)
{
...
...
@@ -5873,7 +5871,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta
}
}
/* The stateblock is passed for GLINFO_LOCATION */
static
GLuint
gen_arbfp_ffp_shader
(
const
struct
ffp_frag_settings
*
settings
,
IWineD3DStateBlockImpl
*
stateblock
)
{
const
struct
wined3d_gl_info
*
gl_info
=
&
stateblock
->
device
->
adapter
->
gl_info
;
...
...
dlls/wined3d/ati_fragment_shader.c
View file @
e8ac9bbd
...
...
@@ -28,8 +28,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d_shader
);
WINE_DECLARE_DEBUG_CHANNEL
(
d3d
);
#define GLINFO_LOCATION (*gl_info)
/* GL locking for state handlers is done by the caller. */
/* Some private defines, Constant associations, etc.
...
...
dlls/wined3d/buffer.c
View file @
e8ac9bbd
...
...
@@ -29,8 +29,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
#define GLINFO_LOCATION (*gl_info)
#define VB_MAXDECLCHANGES 100
/* After that number of decl changes we stop converting */
#define VB_RESETDECLCHANGE 1000
/* Reset the decl changecount after that number of draws */
#define VB_MAXFULLCONVERSIONS 5
/* Number of full conversions before we stop converting */
...
...
dlls/wined3d/context.c
View file @
e8ac9bbd
...
...
@@ -28,8 +28,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
#define GLINFO_LOCATION (*gl_info)
static
DWORD
wined3d_context_tls_idx
;
/* FBO helper functions */
...
...
dlls/wined3d/device.c
View file @
e8ac9bbd
...
...
@@ -34,7 +34,6 @@
#include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
#define GLINFO_LOCATION (*gl_info)
/* Define the default light parameters as specified by MSDN */
const
WINED3DLIGHT
WINED3D_default_light
=
{
...
...
dlls/wined3d/directx.c
View file @
e8ac9bbd
...
...
@@ -30,7 +30,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
WINE_DECLARE_DEBUG_CHANNEL
(
d3d_caps
);
#define GLINFO_LOCATION (*gl_info)
#define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024)
/* The d3d device ID */
...
...
dlls/wined3d/drawprim.c
View file @
e8ac9bbd
...
...
@@ -28,7 +28,6 @@
#include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d_draw
);
#define GLINFO_LOCATION (*gl_info)
#include <stdio.h>
#include <math.h>
...
...
dlls/wined3d/glsl_shader.c
View file @
e8ac9bbd
...
...
@@ -39,8 +39,6 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_constants);
WINE_DECLARE_DEBUG_CHANNEL
(
d3d_caps
);
WINE_DECLARE_DEBUG_CHANNEL
(
d3d
);
#define GLINFO_LOCATION (*gl_info)
#define WINED3D_GLSL_SAMPLE_PROJECTED 0x1
#define WINED3D_GLSL_SAMPLE_RECT 0x2
#define WINED3D_GLSL_SAMPLE_LOD 0x4
...
...
dlls/wined3d/nvidia_texture_shader.c
View file @
e8ac9bbd
...
...
@@ -28,8 +28,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
#define GLINFO_LOCATION (*gl_info)
/* GL locking for state handlers is done by the caller. */
static
void
nvts_activate_dimensions
(
DWORD
stage
,
IWineD3DStateBlockImpl
*
stateblock
,
struct
wined3d_context
*
context
)
...
...
dlls/wined3d/query.c
View file @
e8ac9bbd
...
...
@@ -25,7 +25,6 @@
#include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
#define GLINFO_LOCATION (*gl_info)
BOOL
wined3d_event_query_supported
(
const
struct
wined3d_gl_info
*
gl_info
)
{
...
...
dlls/wined3d/state.c
View file @
e8ac9bbd
...
...
@@ -35,8 +35,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
WINE_DECLARE_DEBUG_CHANNEL
(
d3d_shader
);
#define GLINFO_LOCATION (*gl_info)
/* GL locking for state handlers is done by the caller. */
static
void
state_blendop
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
,
struct
wined3d_context
*
context
);
...
...
@@ -5545,7 +5543,6 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
{
STATE_SAMPLER
(
7
),
{
STATE_SAMPLER
(
7
),
sampler_texdim
},
WINED3D_GL_EXT_NONE
},
{
0
/* Terminate */
,
{
0
,
0
},
WINED3D_GL_EXT_NONE
},
};
#undef GLINFO_LOCATION
/* Context activation is done by the caller. */
static
void
ffp_enable
(
IWineD3DDevice
*
iface
,
BOOL
enable
)
{
}
...
...
dlls/wined3d/surface.c
View file @
e8ac9bbd
...
...
@@ -34,8 +34,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d_surface
);
WINE_DECLARE_DEBUG_CHANNEL
(
d3d
);
#define GLINFO_LOCATION (*gl_info)
static
void
surface_cleanup
(
IWineD3DSurfaceImpl
*
This
)
{
IWineD3DDeviceImpl
*
device
=
This
->
resource
.
device
;
...
...
dlls/wined3d/surface_base.c
View file @
e8ac9bbd
...
...
@@ -83,9 +83,6 @@ static inline unsigned short float_32_to_16(const float *in)
return
ret
;
}
/* Do NOT define GLINFO_LOCATION in this file. THIS CODE MUST NOT USE IT */
/* *******************************************
IWineD3DSurface IUnknown parts follow
******************************************* */
...
...
dlls/wined3d/swapchain.c
View file @
e8ac9bbd
...
...
@@ -33,8 +33,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
WINE_DECLARE_DEBUG_CHANNEL
(
fps
);
#define GLINFO_LOCATION (*gl_info)
/*IWineD3DSwapChain parts follow: */
static
void
WINAPI
IWineD3DSwapChainImpl_Destroy
(
IWineD3DSwapChain
*
iface
)
{
...
...
dlls/wined3d/volume.c
View file @
e8ac9bbd
...
...
@@ -26,8 +26,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d_surface
);
#define GLINFO_LOCATION (*gl_info)
/* Context activation is done by the caller. */
static
void
volume_bind_and_dirtify
(
IWineD3DVolume
*
iface
)
{
IWineD3DVolumeImpl
*
This
=
(
IWineD3DVolumeImpl
*
)
iface
;
...
...
dlls/wined3d/wined3d_private.h
View file @
e8ac9bbd
...
...
@@ -748,7 +748,7 @@ extern int num_lock DECLSPEC_HIDDEN;
/* GL related defines */
/* ------------------ */
#define GL_EXTCALL(
FuncName) (GLINFO_LOCATION.FuncName
)
#define GL_EXTCALL(
f) (gl_info->f
)
#define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xFF)
#define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xFF)
...
...
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