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
5bc44955
Commit
5bc44955
authored
May 14, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
May 15, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add missing GL locking to d3dfmt_p8_upload_palette().
parent
2a48ef1d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
surface.c
dlls/wined3d/surface.c
+6
-0
No files found.
dlls/wined3d/surface.c
View file @
5bc44955
...
@@ -2263,7 +2263,9 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve
...
@@ -2263,7 +2263,9 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve
if
(
GL_SUPPORT
(
EXT_PALETTED_TEXTURE
))
if
(
GL_SUPPORT
(
EXT_PALETTED_TEXTURE
))
{
{
TRACE
(
"Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support
\n
"
);
TRACE
(
"Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support
\n
"
);
ENTER_GL
();
GL_EXTCALL
(
glColorTableEXT
(
This
->
glDescription
.
target
,
GL_RGBA
,
256
,
GL_RGBA
,
GL_UNSIGNED_BYTE
,
table
));
GL_EXTCALL
(
glColorTableEXT
(
This
->
glDescription
.
target
,
GL_RGBA
,
256
,
GL_RGBA
,
GL_UNSIGNED_BYTE
,
table
));
LEAVE_GL
();
}
}
else
else
{
{
...
@@ -2271,6 +2273,8 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve
...
@@ -2271,6 +2273,8 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve
* The 8bit pixel data will be used as an index in this palette texture to retrieve the final color. */
* The 8bit pixel data will be used as an index in this palette texture to retrieve the final color. */
TRACE
(
"Using fragment shaders for emulating 8-bit paletted texture support
\n
"
);
TRACE
(
"Using fragment shaders for emulating 8-bit paletted texture support
\n
"
);
ENTER_GL
();
/* Create the fragment program if we don't have it */
/* Create the fragment program if we don't have it */
if
(
!
device
->
paletteConversionShader
)
if
(
!
device
->
paletteConversionShader
)
{
{
...
@@ -2310,6 +2314,8 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve
...
@@ -2310,6 +2314,8 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve
/* Rebind the texture because it isn't bound anymore */
/* Rebind the texture because it isn't bound anymore */
glBindTexture
(
This
->
glDescription
.
target
,
This
->
glDescription
.
textureName
);
glBindTexture
(
This
->
glDescription
.
target
,
This
->
glDescription
.
textureName
);
LEAVE_GL
();
}
}
}
}
...
...
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