OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed Windows types from several files which don't need them.

Browse source 
- split out the software renderer's video classes into their own file because they got included by all OpenGL sources.
This commit is contained in:
Christoph Oelckers 2017-03-09 12:52:31 +01:00
commit 03e1cbcfc0
17 changed files with 479 additions and 466 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/gl/system/gl_wipe.cpp
View file

@ -47,18 +47,6 @@
#include "gl/data/gl_vertexbuffer.h"
#include "gl/renderer/gl_2ddrawer.h"
#ifndef _WIN32
struct POINT {
int32_t x;
int32_t y;
};
struct RECT {
int32_t left;
int32_t top;
int32_t right;
int32_t bottom;
};
#endif
//===========================================================================
//
@ -414,10 +402,19 @@ int OpenGLFrameBuffer::Wiper_Melt::MakeVBO(int ticks, OpenGLFrameBuffer *fb, boo
}
if (ticks == 0)
{
struct {
int32_t x;
int32_t y;
} dpt;
struct {
int32_t left;
int32_t top;
int32_t right;
int32_t bottom;
} rect;
// Only draw for the final tick.
// No need for optimization. Wipes won't ever be drawn with anything else.
RECT rect;
POINT dpt;
dpt.x = i * fb->Width / WIDTH;
dpt.y = MAX(0, y[i] * fb->Height / HEIGHT);