Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
0064976d
Commit
0064976d
authored
Jul 11, 2008
by
Andrew Talbot
Committed by
Alexandre Julliard
Jul 14, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove unneeded address-of operators from array names.
parent
afc95d4a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
baseshader.c
dlls/wined3d/baseshader.c
+3
-3
directx.c
dlls/wined3d/directx.c
+1
-1
stateblock.c
dlls/wined3d/stateblock.c
+4
-4
surface_base.c
dlls/wined3d/surface_base.c
+1
-1
No files found.
dlls/wined3d/baseshader.c
View file @
0064976d
...
...
@@ -289,7 +289,7 @@ HRESULT shader_get_registers_used(
local_constant
*
lconst
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
local_constant
));
if
(
!
lconst
)
return
E_OUTOFMEMORY
;
lconst
->
idx
=
*
pToken
&
WINED3DSP_REGNUM_MASK
;
memcpy
(
&
lconst
->
value
,
pToken
+
1
,
4
*
sizeof
(
DWORD
));
memcpy
(
lconst
->
value
,
pToken
+
1
,
4
*
sizeof
(
DWORD
));
/* In pixel shader 1.X shaders, the constants are clamped between [-1;1] */
if
(
WINED3DSHADER_VERSION_MAJOR
(
This
->
baseShader
.
hex_version
)
==
1
&&
pshader
)
{
...
...
@@ -312,7 +312,7 @@ HRESULT shader_get_registers_used(
local_constant
*
lconst
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
local_constant
));
if
(
!
lconst
)
return
E_OUTOFMEMORY
;
lconst
->
idx
=
*
pToken
&
WINED3DSP_REGNUM_MASK
;
memcpy
(
&
lconst
->
value
,
pToken
+
1
,
4
*
sizeof
(
DWORD
));
memcpy
(
lconst
->
value
,
pToken
+
1
,
4
*
sizeof
(
DWORD
));
list_add_head
(
&
This
->
baseShader
.
constantsI
,
&
lconst
->
entry
);
pToken
+=
curOpcode
->
num_params
;
...
...
@@ -321,7 +321,7 @@ HRESULT shader_get_registers_used(
local_constant
*
lconst
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
local_constant
));
if
(
!
lconst
)
return
E_OUTOFMEMORY
;
lconst
->
idx
=
*
pToken
&
WINED3DSP_REGNUM_MASK
;
memcpy
(
&
lconst
->
value
,
pToken
+
1
,
1
*
sizeof
(
DWORD
));
memcpy
(
lconst
->
value
,
pToken
+
1
,
1
*
sizeof
(
DWORD
));
list_add_head
(
&
This
->
baseShader
.
constantsB
,
&
lconst
->
entry
);
pToken
+=
curOpcode
->
num_params
;
...
...
dlls/wined3d/directx.c
View file @
0064976d
...
...
@@ -697,7 +697,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
* Initialize openGL extension related variables
* with Default values
*/
memset
(
&
gl_info
->
supported
,
0
,
sizeof
(
gl_info
->
supported
));
memset
(
gl_info
->
supported
,
0
,
sizeof
(
gl_info
->
supported
));
gl_info
->
max_buffers
=
1
;
gl_info
->
max_textures
=
1
;
gl_info
->
max_texture_stages
=
1
;
...
...
dlls/wined3d/stateblock.c
View file @
0064976d
...
...
@@ -1046,10 +1046,10 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat
This
->
blockType
=
WINED3DSBT_INIT
;
/* Set some of the defaults for lights, transforms etc */
memcpy
(
&
This
->
transforms
[
WINED3DTS_PROJECTION
],
&
identity
,
sizeof
(
identity
));
memcpy
(
&
This
->
transforms
[
WINED3DTS_VIEW
],
&
identity
,
sizeof
(
identity
));
memcpy
(
&
This
->
transforms
[
WINED3DTS_PROJECTION
],
identity
,
sizeof
(
identity
));
memcpy
(
&
This
->
transforms
[
WINED3DTS_VIEW
],
identity
,
sizeof
(
identity
));
for
(
i
=
0
;
i
<
256
;
++
i
)
{
memcpy
(
&
This
->
transforms
[
WINED3DTS_WORLDMATRIX
(
i
)],
&
identity
,
sizeof
(
identity
));
memcpy
(
&
This
->
transforms
[
WINED3DTS_WORLDMATRIX
(
i
)],
identity
,
sizeof
(
identity
));
}
TRACE
(
"Render states
\n
"
);
...
...
@@ -1193,7 +1193,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat
/* Texture Stage States - Put directly into state block, we will call function below */
for
(
i
=
0
;
i
<
MAX_TEXTURES
;
i
++
)
{
TRACE
(
"Setting up default texture states for texture Stage %d
\n
"
,
i
);
memcpy
(
&
This
->
transforms
[
WINED3DTS_TEXTURE0
+
i
],
&
identity
,
sizeof
(
identity
));
memcpy
(
&
This
->
transforms
[
WINED3DTS_TEXTURE0
+
i
],
identity
,
sizeof
(
identity
));
This
->
textureState
[
i
][
WINED3DTSS_COLOROP
]
=
(
i
==
0
)
?
WINED3DTOP_MODULATE
:
WINED3DTOP_DISABLE
;
This
->
textureState
[
i
][
WINED3DTSS_COLORARG1
]
=
WINED3DTA_TEXTURE
;
This
->
textureState
[
i
][
WINED3DTSS_COLORARG2
]
=
WINED3DTA_CURRENT
;
...
...
dlls/wined3d/surface_base.c
View file @
0064976d
...
...
@@ -544,7 +544,7 @@ HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface) {
b_info
->
bmiHeader
.
biClrImportant
=
0
;
/* Get the bit masks */
masks
=
(
DWORD
*
)
&
(
b_info
->
bmiColors
)
;
masks
=
(
DWORD
*
)
b_info
->
bmiColors
;
switch
(
This
->
resource
.
format
)
{
case
WINED3DFMT_R8G8B8
:
usage
=
DIB_RGB_COLORS
;
...
...
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