AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove extra CR chars

Browse Source
This commit is contained in:
Karl Schultz
2001-10-04 19:03:11 +00:00
parent 31c40f0905
commit d3788b60ae
2 changed files with 194 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/windows/mesa_extend.h
+43 -43
View File
@@ -1,43 +1,43 @@
/* mesa_extend.h
* for wmesa-2.3
* Written by Li Wei (liwei@aiar.xjtu.edu.cn)
*/
/* Log 6/14, 1997
* revision 1.01
* struct DisplayOptions defined for tk_ddmesa.c to read the initial file
*/
#include <GL/gl.h>
#include <stdlib.h>
#include <windows.h>
#include <winbase.h>
typedef enum SHIFT{ SHIFT_NONE, SHIFT_LEFT,SHIFT_RIGHT,SHIFT_UP,SHIFT_DOWN,SHIFT_FAR,SHIFT_NEAR};
extern GLfloat deltaView ;
extern GLuint viewShift;
extern GLenum glImageRendered();
extern GLenum imageRendered ;
extern GLfloat deltaView ;
extern GLfloat deltaShift;
void shiftView( void );
struct DISPLAY_OPTIONS {
int stereo;
int fullScreen;
int mode;
int bpp;
};
extern struct DISPLAY_OPTIONS displayOptions;
extern void getDisplayOptions( void);
GLenum defaultKeyProc(int, GLenum);
extern GLenum (*userKeyProc) (int, GLenum);
/* mesa_extend.h
* for wmesa-2.3
* Written by Li Wei (liwei@aiar.xjtu.edu.cn)
*/
/* Log 6/14, 1997
* revision 1.01
* struct DisplayOptions defined for tk_ddmesa.c to read the initial file
*/
#include <GL/gl.h>
#include <stdlib.h>
#include <windows.h>
#include <winbase.h>
typedef enum SHIFT{ SHIFT_NONE, SHIFT_LEFT,SHIFT_RIGHT,SHIFT_UP,SHIFT_DOWN,SHIFT_FAR,SHIFT_NEAR};
extern GLfloat deltaView ;
extern GLuint viewShift;
extern GLenum glImageRendered();
extern GLenum imageRendered ;
extern GLfloat deltaView ;
extern GLfloat deltaShift;
void shiftView( void );
struct DISPLAY_OPTIONS {
int stereo;
int fullScreen;
int mode;
int bpp;
};
extern struct DISPLAY_OPTIONS displayOptions;
extern void getDisplayOptions( void);
GLenum defaultKeyProc(int, GLenum);
extern GLenum (*userKeyProc) (int, GLenum);
src/mesa/drivers/windows/wmesadef.h
+151 -151
View File
@@ -1,154 +1,154 @@
/* File name : wmesadef.h
* Version : 2.3
*
* Header file for display driver for Mesa 2.3 under
* Windows95, WindowsNT and Win32
*
* Copyright (C) 1996- Li Wei
* Address : Institute of Artificial Intelligence
* : & Robotics
* : Xi'an Jiaotong University
* Email : liwei@aiar.xjtu.edu.cn
* Web page : http://sun.aiar.xjtu.edu.cn
*
* This file and its associations are partially based on the
* Windows NT driver for Mesa, written by Mark Leaming
* (mark@rsinc.com).
*/
/*
* $Log: wmesadef.h,v $
* Revision 1.1 1999/08/19 00:55:42 jtg
* Initial revision
/* File name : wmesadef.h
* Version : 2.3
*
* Revision 1.3 1999/01/03 03:08:57 brianp
* Ted Jump's changes
*
* Initial version 1997/6/14 CST by Li Wei(liwei@aiar.xjtu.edu.cn)
*/
/*
* $Log: wmesadef.h,v $
* Revision 1.1 1999/08/19 00:55:42 jtg
* Initial revision
* Header file for display driver for Mesa 2.3 under
* Windows95, WindowsNT and Win32
*
* Revision 1.3 1999/01/03 03:08:57 brianp
* Ted Jump's changes
*
* Revision 2.1 1996/11/15 10:54:00 CST by Li Wei(liwei@aiar.xjtu.edu.cn)
* a new element added to wmesa_context :
* dither_flag
*/
/*
* $Log: wmesadef.h,v $
* Revision 1.1 1999/08/19 00:55:42 jtg
* Initial revision
* Copyright (C) 1996- Li Wei
* Address : Institute of Artificial Intelligence
* : & Robotics
* : Xi'an Jiaotong University
* Email : liwei@aiar.xjtu.edu.cn
* Web page : http://sun.aiar.xjtu.edu.cn
*
* Revision 1.3 1999/01/03 03:08:57 brianp
* Ted Jump's changes
*
* Revision 2.0 1996/11/15 10:54:00 CST by Li Wei(liwei@aiar.xjtu.edu.cn)
* Initial revision
*/
#ifndef DDMESADEF_H
#define DDMESADEF_H
#include <windows.h>
#include <GL\gl.h>
#include "context.h"
#ifdef DDRAW
#include <ddraw.h>
#endif
//#include "profile.h"
#define REDBITS 0x03
#define REDSHIFT 0x00
#define GREENBITS 0x03
#define GREENSHIFT 0x03
#define BLUEBITS 0x02
#define BLUESHIFT 0x06
typedef struct _dibSection{
HDC hDC;
HANDLE hFileMap;
BOOL fFlushed;
LPVOID base;
}WMDIBSECTION, *PWMDIBSECTION;
typedef struct wmesa_context{
GLcontext *gl_ctx; /* The core GL/Mesa context */
GLvisual *gl_visual; /* Describes the buffers */
GLframebuffer *gl_buffer; /* Depth, stencil, accum, etc buffers */
HWND Window;
HDC hDC;
HPALETTE hPalette;
HPALETTE hOldPalette;
HPEN hPen;
HPEN hOldPen;
HCURSOR hOldCursor;
COLORREF crColor;
// 3D projection stuff
RECT drawRect;
UINT uiDIBoffset;
// OpenGL stuff
HPALETTE hGLPalette;
GLuint width;
GLuint height;
GLuint ScanWidth;
GLboolean db_flag; //* double buffered?
GLboolean rgb_flag; //* RGB mode?
GLboolean dither_flag; //* use dither when 256 color mode for RGB?
GLuint depth; //* bits per pixel (1, 8, 24, etc)
ULONG pixel; // current color index or RGBA pixel value
ULONG clearpixel; //* pixel for clearing the color buffers
PBYTE ScreenMem; // WinG memory
BITMAPINFO *IndexFormat;
HPALETTE hPal; // Current Palette
HPALETTE hPalHalfTone;
WMDIBSECTION dib;
BITMAPINFO bmi;
HBITMAP hbmDIB;
HBITMAP hOldBitmap;
HBITMAP Old_Compat_BM;
HBITMAP Compat_BM; // Bitmap for double buffering
PBYTE pbPixels;
int nColors;
BYTE cColorBits;
int pixelformat;
#ifdef DDRAW
LPDIRECTDRAW lpDD; // DirectDraw object
// LPDIRECTDRAW2 lpDD2; // DirectDraw object
LPDIRECTDRAWSURFACE lpDDSPrimary; // DirectDraw primary surface
LPDIRECTDRAWSURFACE lpDDSOffScreen; // DirectDraw off screen surface
LPDIRECTDRAWPALETTE lpDDPal; // DirectDraw palette
BOOL bActive; // is application active?
DDSURFACEDESC ddsd;
int fullScreen;
int gMode ;
#endif
RECT rectOffScreen;
RECT rectSurface;
HWND hwnd;
DWORD pitch;
PBYTE addrOffScreen;
//#ifdef PROFILE
// MESAPROF profile;
//#endif
} *PWMC;
#define PAGE_FILE 0xffffffff
#endif
* This file and its associations are partially based on the
* Windows NT driver for Mesa, written by Mark Leaming
* (mark@rsinc.com).
*/
/*
* $Log: wmesadef.h,v
* Revision 1.1.1.1 1999/08/19 00:55:42 jt
* Imported source
* Revision 1.3 1999/01/03 03:08:57 brian
* Ted Jump's change
*
* Initial version 1997/6/14 CST by Li Wei(liwei@aiar.xjtu.edu.cn)
*/
/*
* $Log: wmesadef.h,v
* Revision 1.1.1.1 1999/08/19 00:55:42 jt
* Imported source
* Revision 1.3 1999/01/03 03:08:57 brian
* Ted Jump's change
*
* Revision 2.1 1996/11/15 10:54:00 CST by Li Wei(liwei@aiar.xjtu.edu.cn)
* a new element added to wmesa_context :
* dither_flag
*/
/*
* $Log: wmesadef.h,v
* Revision 1.1.1.1 1999/08/19 00:55:42 jt
* Imported source
* Revision 1.3 1999/01/03 03:08:57 brian
* Ted Jump's change
*
* Revision 2.0 1996/11/15 10:54:00 CST by Li Wei(liwei@aiar.xjtu.edu.cn)
* Initial revision
*/
#ifndef DDMESADEF_H
#define DDMESADEF_H
#include <windows.h>
#include <GL\gl.h>
#include "context.h"
#ifdef DDRAW
#include <ddraw.h>
#endif
//#include "profile.h"
#define REDBITS 0x03
#define REDSHIFT 0x00
#define GREENBITS 0x03
#define GREENSHIFT 0x03
#define BLUEBITS 0x02
#define BLUESHIFT 0x06
typedef struct _dibSection{
HDC hDC;
HANDLE hFileMap;
BOOL fFlushed;
LPVOID base;
}WMDIBSECTION, *PWMDIBSECTION;
typedef struct wmesa_context{
GLcontext *gl_ctx; /* The core GL/Mesa context */
GLvisual *gl_visual; /* Describes the buffers */
GLframebuffer *gl_buffer; /* Depth, stencil, accum, etc buffers */
HWND Window;
HDC hDC;
HPALETTE hPalette;
HPALETTE hOldPalette;
HPEN hPen;
HPEN hOldPen;
HCURSOR hOldCursor;
COLORREF crColor;
// 3D projection stuff
RECT drawRect;
UINT uiDIBoffset;
// OpenGL stuff
HPALETTE hGLPalette;
GLuint width;
GLuint height;
GLuint ScanWidth;
GLboolean db_flag; //* double buffered?
GLboolean rgb_flag; //* RGB mode?
GLboolean dither_flag; //* use dither when 256 color mode for RGB?
GLuint depth; //* bits per pixel (1, 8, 24, etc)
ULONG pixel; // current color index or RGBA pixel value
ULONG clearpixel; //* pixel for clearing the color buffers
PBYTE ScreenMem; // WinG memory
BITMAPINFO *IndexFormat;
HPALETTE hPal; // Current Palette
HPALETTE hPalHalfTone;
WMDIBSECTION dib;
BITMAPINFO bmi;
HBITMAP hbmDIB;
HBITMAP hOldBitmap;
HBITMAP Old_Compat_BM;
HBITMAP Compat_BM; // Bitmap for double buffering
PBYTE pbPixels;
int nColors;
BYTE cColorBits;
int pixelformat;
#ifdef DDRAW
LPDIRECTDRAW lpDD; // DirectDraw object
// LPDIRECTDRAW2 lpDD2; // DirectDraw object
LPDIRECTDRAWSURFACE lpDDSPrimary; // DirectDraw primary surface
LPDIRECTDRAWSURFACE lpDDSOffScreen; // DirectDraw off screen surface
LPDIRECTDRAWPALETTE lpDDPal; // DirectDraw palette
BOOL bActive; // is application active?
DDSURFACEDESC ddsd;
int fullScreen;
int gMode ;
#endif
RECT rectOffScreen;
RECT rectSurface;
HWND hwnd;
DWORD pitch;
PBYTE addrOffScreen;
//#ifdef PROFILE
// MESAPROF profile;
//#endif
} *PWMC;
#define PAGE_FILE 0xffffffff
#endif