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
b1abafcf
Commit
b1abafcf
authored
Jun 11, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Jun 11, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Also flip the point sprite coordinate origin when rendering offscreen.
parent
67f15e71
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
0 deletions
+24
-0
context.c
dlls/wined3d/context.c
+12
-0
directx.c
dlls/wined3d/directx.c
+2
-0
drawprim.c
dlls/wined3d/drawprim.c
+7
-0
wined3d_gl.h
dlls/wined3d/wined3d_gl.h
+3
-0
No files found.
dlls/wined3d/context.c
View file @
b1abafcf
...
...
@@ -1482,6 +1482,12 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3
checkGLcall
(
"glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"
);
}
if
(
gl_info
->
supported
[
WINED3D_GL_VERSION_2_0
])
{
glPointParameteri
(
GL_POINT_SPRITE_COORD_ORIGIN
,
GL_UPPER_LEFT
);
checkGLcall
(
"glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT)"
);
}
if
(
gl_info
->
supported
[
ARB_PROVOKING_VERTEX
])
{
GL_EXTCALL
(
glProvokingVertex
(
GL_FIRST_VERTEX_CONVENTION
));
...
...
@@ -1939,6 +1945,12 @@ static inline void context_set_render_offscreen(struct wined3d_context *context,
{
if
(
context
->
render_offscreen
==
offscreen
)
return
;
if
(
context
->
gl_info
->
supported
[
WINED3D_GL_VERSION_2_0
])
{
glPointParameteri
(
GL_POINT_SPRITE_COORD_ORIGIN
,
offscreen
?
GL_LOWER_LEFT
:
GL_UPPER_LEFT
);
checkGLcall
(
"glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)"
);
}
Context_MarkStateDirty
(
context
,
STATE_TRANSFORM
(
WINED3DTS_PROJECTION
),
StateTable
);
Context_MarkStateDirty
(
context
,
STATE_VDECL
,
StateTable
);
Context_MarkStateDirty
(
context
,
STATE_VIEWPORT
,
StateTable
);
...
...
dlls/wined3d/directx.c
View file @
b1abafcf
...
...
@@ -2287,6 +2287,8 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter)
}
}
if
(
gl_version
>=
MAKEDWORD_VERSION
(
2
,
0
))
gl_info
->
supported
[
WINED3D_GL_VERSION_2_0
]
=
TRUE
;
if
(
gl_info
->
supported
[
APPLE_FENCE
])
{
/* GL_NV_fence and GL_APPLE_fence provide the same functionality basically.
...
...
dlls/wined3d/drawprim.c
View file @
b1abafcf
...
...
@@ -644,6 +644,13 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT
}
}
if
(
!
context
->
gl_info
->
supported
[
WINED3D_GL_VERSION_2_0
]
&&
context
->
render_offscreen
&&
This
->
stateBlock
->
renderState
[
WINED3DRS_POINTSPRITEENABLE
]
&&
This
->
stateBlock
->
gl_primitive_type
==
GL_POINTS
)
{
FIXME
(
"Point sprite coordinate origin switching not supported.
\n
"
);
}
/* Ok, we will be updating the screen from here onwards so grab the lock */
ENTER_GL
();
{
...
...
dlls/wined3d/wined3d_gl.h
View file @
b1abafcf
...
...
@@ -1353,6 +1353,7 @@ void (WINE_GLAPI *glVertex4sv)(const GLshort *v) DECLSPEC_HIDDEN;
void
(
WINE_GLAPI
*
glVertexPointer
)(
GLint
size
,
GLenum
type
,
GLsizei
stride
,
const
GLvoid
*
pointer
)
DECLSPEC_HIDDEN
;
void
(
WINE_GLAPI
*
glViewport
)(
GLint
x
,
GLint
y
,
GLsizei
width
,
GLsizei
height
)
DECLSPEC_HIDDEN
;
void
(
WINE_GLAPI
*
glPointParameterfv
)(
GLenum
pname
,
const
GLfloat
*
params
)
DECLSPEC_HIDDEN
;
void
(
WINE_GLAPI
*
glPointParameteri
)(
GLenum
name
,
GLint
value
)
DECLSPEC_HIDDEN
;
/* glFinish and glFlush are always loaded from opengl32.dll, thus they always have
* __stdcall calling convention.
...
...
@@ -1708,6 +1709,7 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN;
USE_GL_FUNC(glVertexPointer) \
USE_GL_FUNC(glViewport) \
USE_GL_FUNC(glPointParameterfv) \
USE_GL_FUNC(glPointParameteri) \
#define WGL_FUNCS_GEN \
USE_WGL_FUNC(wglCreateContext) \
...
...
@@ -1835,6 +1837,7 @@ typedef enum wined3d_gl_extension
WGL_WINE_PIXEL_FORMAT_PASSTHROUGH
,
/* Internally used */
WINE_NORMALIZED_TEXRECT
,
WINED3D_GL_VERSION_2_0
,
WINED3D_GL_EXT_COUNT
,
}
GL_SupportedExt
;
...
...
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