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
a3854be0
Commit
a3854be0
authored
Jun 17, 2007
by
Stefan Dösinger
Committed by
Alexandre Julliard
Jun 25, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Some point sprite fixes.
parent
97b1d069
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
24 deletions
+12
-24
context.c
dlls/wined3d/context.c
+8
-2
state.c
dlls/wined3d/state.c
+4
-22
No files found.
dlls/wined3d/context.c
View file @
a3854be0
...
...
@@ -206,6 +206,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar
GLXFBConfig
*
cfgs
=
NULL
;
GLXContext
ctx
=
NULL
,
oldCtx
;
WineD3DContext
*
ret
=
NULL
;
int
s
;
TRACE
(
"(%p): Creating a %s context for render target %p
\n
"
,
This
,
win
?
"onscreen"
:
"offscreen"
,
target
);
...
...
@@ -368,8 +369,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar
checkGLcall
(
"glEnable(GL_WEIGHT_SUM_UNITY_ARB)"
);
}
if
(
GL_SUPPORT
(
NV_TEXTURE_SHADER2
))
{
int
s
;
glEnable
(
GL_TEXTURE_SHADER_NV
);
checkGLcall
(
"glEnable(GL_TEXTURE_SHADER_NV)"
);
...
...
@@ -382,6 +381,13 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar
checkGLcall
(
"glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, ...
\n
"
);
}
}
if
(
GL_SUPPORT
(
ARB_POINT_SPRITE
))
{
for
(
s
=
0
;
s
<
GL_LIMITS
(
textures
);
s
++
)
{
GL_EXTCALL
(
glActiveTextureARB
(
GL_TEXTURE0_ARB
+
s
));
glTexEnvi
(
GL_POINT_SPRITE_ARB
,
GL_COORD_REPLACE_ARB
,
GL_TRUE
);
checkGLcall
(
"glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)
\n
"
);
}
}
if
(
oldDrawable
&&
oldCtx
)
{
glXMakeCurrent
(
display
,
oldDrawable
,
oldCtx
);
...
...
dlls/wined3d/state.c
View file @
a3854be0
...
...
@@ -1315,9 +1315,6 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, Win
}
static
void
state_pointsprite
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
,
WineD3DContext
*
context
)
{
unsigned
int
i
;
int
val
;
/* TODO: NV_POINT_SPRITE */
if
(
!
GL_SUPPORT
(
ARB_POINT_SPRITE
))
{
TRACE
(
"Point sprites not supported
\n
"
);
...
...
@@ -1325,26 +1322,11 @@ static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, W
}
if
(
stateblock
->
renderState
[
WINED3DRS_POINTSPRITEENABLE
])
{
val
=
GL_TRUE
;
glEnable
(
GL_POINT_SPRITE_ARB
);
checkGLcall
(
"glEnable(GL_POINT_SPRITE_ARB)
\n
"
);
}
else
{
val
=
GL_FALSE
;
}
for
(
i
=
0
;
i
<
GL_LIMITS
(
textures
);
i
++
)
{
/* Note the WINED3DRS value applies to all textures, but GL has one
* per texture, so apply it now ready to be used!
*/
if
(
GL_SUPPORT
(
ARB_MULTITEXTURE
))
{
GL_EXTCALL
(
glActiveTextureARB
(
GL_TEXTURE0_ARB
+
i
));
checkGLcall
(
"glActiveTextureARB"
);
}
else
if
(
i
==
1
)
{
FIXME
(
"Program using multiple concurrent textures which this opengl implementation doesn't support
\n
"
);
break
;
}
glTexEnvi
(
GL_POINT_SPRITE_ARB
,
GL_COORD_REPLACE_ARB
,
val
);
checkGLcall
((
val
?
"glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_TRUE)"
:
"glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE)"
));
glDisable
(
GL_POINT_SPRITE_ARB
);
checkGLcall
(
"glDisable(GL_POINT_SPRITE_ARB)
\n
"
);
}
}
...
...
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