cosmetics and memos
This commit is contained in:
@@ -1276,16 +1276,6 @@ static void dmesa_init_pointers (GLcontext *ctx)
|
||||
tnl = TNL_CONTEXT(ctx);
|
||||
tnl->Driver.RunPipeline = _tnl_run_pipeline;
|
||||
|
||||
#if FEATURE_ARB_vertex_buffer_object
|
||||
ctx->Driver.NewBufferObject = _mesa_new_buffer_object;
|
||||
ctx->Driver.DeleteBuffer = _mesa_delete_buffer_object;
|
||||
ctx->Driver.BindBuffer = NULL;
|
||||
ctx->Driver.BufferData = _mesa_buffer_data;
|
||||
ctx->Driver.BufferSubData = _mesa_buffer_subdata;
|
||||
ctx->Driver.MapBuffer = _mesa_buffer_map;
|
||||
ctx->Driver.UnmapBuffer = NULL;
|
||||
#endif
|
||||
|
||||
dd->SetBuffer = set_buffer;
|
||||
|
||||
/* Install swsetup for tnl->Driver.Render.*:
|
||||
|
||||
@@ -165,7 +165,7 @@ fxSetupTextureEnvNapalm_NoLock(GLcontext * ctx, GLuint textureset, GLuint tmu, G
|
||||
const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[textureset];
|
||||
struct tdfx_combine_alpha_ext alphaComb;
|
||||
struct tdfx_combine_color_ext colorComb;
|
||||
GLfloat *envColor = texUnit->EnvColor;
|
||||
const GLfloat *envColor = texUnit->EnvColor;
|
||||
GrCombineLocal_t localc, locala; /* fragmentColor/Alpha */
|
||||
GLint ifmt;
|
||||
tfxTexInfo *ti;
|
||||
@@ -378,6 +378,9 @@ fxSetupTextureEnvNapalm_NoLock(GLcontext * ctx, GLuint textureset, GLuint tmu, G
|
||||
break;
|
||||
/* COMBINE_EXT */
|
||||
case GL_COMBINE_EXT:
|
||||
/* [dBorca] Hack alert:
|
||||
* INCOMPLETE!!!
|
||||
*/
|
||||
if (TDFX_DEBUG & (VERBOSE_DRIVER | VERBOSE_TEXTURE)) {
|
||||
fprintf(stderr, "COMBINE_EXT: %s + %s\n",
|
||||
_mesa_lookup_enum_by_nr(texUnit->CombineModeRGB),
|
||||
|
||||
Reference in New Issue
Block a user