Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Kart-Public
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alam Ed Arias
Kart-Public
Commits
fea55939
Commit
fea55939
authored
10 years ago
by
Eidolon
Browse files
Options
Downloads
Patches
Plain Diff
sdl2: we have colored rects in gl now I guess
parent
0a37bdf7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/sdl2/i_video.c
+8
-9
8 additions, 9 deletions
src/sdl2/i_video.c
with
8 additions
and
9 deletions
src/sdl2/i_video.c
+
8
−
9
View file @
fea55939
...
...
@@ -273,7 +273,7 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
#ifdef HWRENDER
else
if
(
rendermode
==
render_opengl
)
{
if
(
sdlglcontext
==
0
)
if
(
sdlglcontext
==
NULL
)
{
sdlglcontext
=
SDL_GL_CreateContext
(
window
);
}
...
...
@@ -1331,7 +1331,7 @@ void I_OsPolling(void)
//
void
I_UpdateNoBlit
(
void
)
{
if
(
!
vidSurfac
e
)
if
(
rendermode
==
render_non
e
)
return
;
if
(
exposevideo
)
{
...
...
@@ -1339,13 +1339,12 @@ void I_UpdateNoBlit(void)
if
(
rendermode
==
render_opengl
)
{
OglSdlFinishUpdate
(
cv_vidwait
.
value
);
SDL_
GL_SwapWindow
(
window
);
SDL_
RenderPresent
(
renderer
);
}
else
#endif
if
(
rendermode
==
render_soft
)
{
SDL_RenderClear
(
renderer
);
SDL_RenderCopy
(
renderer
,
texture
,
NULL
,
NULL
);
SDL_RenderPresent
(
renderer
);
}
...
...
@@ -1406,7 +1405,7 @@ static inline SDL_bool SDLmatchVideoformat(void)
//
void
I_FinishUpdate
(
void
)
{
if
(
!
vidSurfac
e
)
if
(
rendermode
==
render_non
e
)
return
;
//Alam: No software or OpenGl surface
if
(
I_SkipFrame
())
...
...
@@ -1437,7 +1436,6 @@ void I_FinishUpdate(void)
SDL_UpdateTexture
(
texture
,
NULL
,
vidSurface
->
pixels
,
realwidth
*
4
);
}
// Blit buffer to texture
SDL_RenderClear
(
renderer
);
SDL_RenderCopy
(
renderer
,
texture
,
NULL
,
NULL
);
SDL_RenderPresent
(
renderer
);
}
...
...
@@ -1446,6 +1444,7 @@ void I_FinishUpdate(void)
else
{
OglSdlFinishUpdate
(
cv_vidwait
.
value
);
//SDL_RenderPresent(renderer);
}
#endif
exposevideo
=
SDL_FALSE
;
...
...
@@ -1827,10 +1826,10 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
* We want at least 1 bit R, G, and B,
* and at least 16 bpp. Why 1 bit? May be more?
*/
SDL_GL_SetAttribute
(
SDL_GL_RED_SIZE
,
1
);
/*
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 1);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 1);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 1);
SDL_GL_SetAttribute
(
SDL_GL_DOUBLEBUFFER
,
1
);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
*/
window
=
SDL_CreateWindow
(
"SRB2"
,
SDL_WINDOWPOS_CENTERED
,
SDL_WINDOWPOS_CENTERED
,
realwidth
,
realheight
,
flags
|
SDL_WINDOW_OPENGL
);
...
...
@@ -1839,7 +1838,7 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
renderer
=
SDL_CreateRenderer
(
window
,
-
1
,
0
);
if
(
renderer
!=
NULL
)
{
SDL_RenderSetLogicalSize
(
renderer
,
BASEVIDWIDTH
,
BASEVIDHEIGHT
);
//
SDL_RenderSetLogicalSize(renderer, BASEVIDWIDTH, BASEVIDHEIGHT);
sdlglcontext
=
SDL_GL_CreateContext
(
window
);
}
else
return
SDL_FALSE
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment