Move client/refresh/header/* and qgl.h to client/refresh/gl/header/*

and the changes in the including files for this.

(also removed gl.h includes from local.h, as it's already included in
 qgl.h which is included by local.h)
This commit is contained in:
Daniel Gibson 2016-12-19 04:10:58 +01:00
parent 73cf610cdb
commit 181d4fa0ea
21 changed files with 22 additions and 32 deletions

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "../gl/header/local.h"
void
LoadMD2(model_t *mod, void *buffer)

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "../gl/header/local.h"
void
LoadPCX(char *origname, byte **pic, byte **palette, int *width, int *height)

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "../gl/header/local.h"
extern int modfilelen;

View file

@ -28,7 +28,7 @@
#include <stdlib.h>
#include "../header/local.h"
#include "../gl/header/local.h"
// don't need HDR stuff
#define STBI_NO_LINEAR

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "../gl/header/local.h"
image_t *
LoadWal(char *origname)

View file

@ -31,19 +31,8 @@
#include <ctype.h>
#include <math.h>
#ifdef _WIN32
#include <windows.h>
#endif
#if defined(__APPLE__)
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
#include "../../header/ref.h"
// FIXME: can we avoid including qgl.h here? it's specific to the gl1 backend
#include "../gl/qgl.h"
#include "../../../header/ref.h"
#include "qgl.h"
#ifndef GL_COLOR_INDEX8_EXT
#define GL_COLOR_INDEX8_EXT GL_COLOR_INDEX

View file

@ -33,7 +33,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "header/local.h"
/*
* GL extensions

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "header/local.h"
image_t *draw_chars;
@ -347,7 +347,7 @@ RDraw_StretchRaw(int x, int y, int w, int h, int cols, int rows, byte *data)
{
GLfloat tex[8];
byte *source;
float hscale;
float hscale = 1.0f;
int frac, fracstep;
int i, j, trows;
int row;

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "header/local.h"
image_t gltextures[MAX_GLTEXTURES];
int numgltextures;

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "header/local.h"
#define DLIGHT_CUTOFF 64

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "header/local.h"
extern gllightmapstate_t gl_lms;

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "header/local.h"
#define NUM_BEAM_SEGS 6

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "header/local.h"
#define NUMVERTEXNORMALS 162
#define SHADEDOT_QUANT 16

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "header/local.h"
byte dottexture[8][8] = {
{0, 0, 0, 0, 0, 0, 0, 0},

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "header/local.h"
#define MAX_MOD_KNOWN 512

View file

@ -25,7 +25,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "header/local.h"
int scrap_allocated[MAX_SCRAPS][BLOCK_WIDTH];
byte scrap_texels[MAX_SCRAPS][BLOCK_WIDTH * BLOCK_HEIGHT];

View file

@ -1,6 +1,6 @@
// SDL-specific OpenGL shit formerly in refresh.c
#include "../header/local.h"
#include "header/local.h"
#ifdef SDL2
#include <SDL2/SDL.h>

View file

@ -25,7 +25,8 @@
*/
#include <assert.h>
#include "../header/local.h"
#include "header/local.h"
int c_visible_lightmaps;
int c_visible_textures;

View file

@ -24,7 +24,7 @@
* =======================================================================
*/
#include "../header/local.h"
#include "header/local.h"
#define TURBSCALE (256.0 / (2 * M_PI))
#define SUBDIVIDE_SIZE 64