Difference for arch/ogl/include/loadgl.h from version 1.5 to 1.6

version 1.5

version 1.6

Line 40

#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED

#endif

#ifndef GL_NV_register_combiners

#define GL_NV_register_combiners 1

#define GL_REGISTER_COMBINERS_NV 0x8522

#define GL_VARIABLE_A_NV 0x8523

#define GL_VARIABLE_B_NV 0x8524

#define GL_VARIABLE_C_NV 0x8525

#define GL_VARIABLE_D_NV 0x8526

#define GL_VARIABLE_E_NV 0x8527

#define GL_VARIABLE_F_NV 0x8528

#define GL_VARIABLE_G_NV 0x8529

#define GL_CONSTANT_COLOR0_NV 0x852A

#define GL_CONSTANT_COLOR1_NV 0x852B

#define GL_PRIMARY_COLOR_NV 0x852C

#define GL_SECONDARY_COLOR_NV 0x852D

#define GL_SPARE0_NV 0x852E

#define GL_SPARE1_NV 0x852F

#define GL_DISCARD_NV 0x8530

#define GL_E_TIMES_F_NV 0x8531

#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532

#define GL_UNSIGNED_IDENTITY_NV 0x8536

#define GL_UNSIGNED_INVERT_NV 0x8537

#define GL_EXPAND_NORMAL_NV 0x8538

#define GL_EXPAND_NEGATE_NV 0x8539

#define GL_HALF_BIAS_NORMAL_NV 0x853A

#define GL_HALF_BIAS_NEGATE_NV 0x853B

#define GL_SIGNED_IDENTITY_NV 0x853C

#define GL_SIGNED_NEGATE_NV 0x853D

#define GL_SCALE_BY_TWO_NV 0x853E

#define GL_SCALE_BY_FOUR_NV 0x853F

#define GL_SCALE_BY_ONE_HALF_NV 0x8540

#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541

#define GL_COMBINER_INPUT_NV 0x8542

#define GL_COMBINER_MAPPING_NV 0x8543

#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544

#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545

#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546

#define GL_COMBINER_MUX_SUM_NV 0x8547

#define GL_COMBINER_SCALE_NV 0x8548

#define GL_COMBINER_BIAS_NV 0x8549

#define GL_COMBINER_AB_OUTPUT_NV 0x854A

#define GL_COMBINER_CD_OUTPUT_NV 0x854B

#define GL_COMBINER_SUM_OUTPUT_NV 0x854C

#define GL_MAX_GENERAL_COMBINERS_NV 0x854D

#define GL_NUM_GENERAL_COMBINERS_NV 0x854E

#define GL_COLOR_SUM_CLAMP_NV 0x854F

#define GL_COMBINER0_NV 0x8550

#define GL_COMBINER1_NV 0x8551

#define GL_COMBINER2_NV 0x8552

#define GL_COMBINER3_NV 0x8553

#define GL_COMBINER4_NV 0x8554

#define GL_COMBINER5_NV 0x8555

#define GL_COMBINER6_NV 0x8556

#define GL_COMBINER7_NV 0x8557

#endif

#ifdef _cplusplus

#define OEXTERN extern "C"

#else

Line 398

Line 453

#define glColorTableEXT dglColorTableEXT

#define glCombinerParameteriNV dglCombinerParameteriNV

#define glCombinerInputNV dglCombinerInputNV

#define glCombinerOutputNV dglCombinerOutputNV

#ifdef WIN32

#define wglCopyContext dwglCopyContext

#define wglCreateContext dwglCreateContext

Line 764

Line 823

typedef void (OGLFUNCCALL *glMultiTexCoord2fSGIS_fp)(GLenum target, GLfloat s, GLfloat t);

typedef void (OGLFUNCCALL *glSelectTextureSGIS_fp)(GLenum target);

typedef void (OGLFUNCCALL *glColorTableEXT_fp)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);

typedef void (OGLFUNCCALL *glCombinerParameteriNV_fp)(GLenum, GLint);

typedef void (OGLFUNCCALL *glCombinerInputNV_fp)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);

typedef void (OGLFUNCCALL *glCombinerOutputNV_fp)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);

#ifdef WIN32

typedef BOOL (OGLFUNCCALL *wglCopyContext_fp)(HGLRC, HGLRC, UINT);

Line 1948

Line 2010

dglSelectTextureSGIS = NULL;

dglColorTableEXT = NULL;

dglCombinerParameteriNV = NULL;

dglCombinerInputNV = NULL;

dglCombinerOutputNV = NULL;

#ifdef WIN32

dwglCopyContext = NULL;

Legend:
line(s) removed in v.1.5
line(s) changed
	line(s) added in v.1.6