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

Disable vertex shader fog, compute fog in fragment shader.

This commit is contained in:
Brian 2007-09-25 15:18:51 -06:00
parent 07f31a29b4
commit 3bf8d2ac71
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mesa/main/texenvprogram.c
View File

@ -1097,15 +1097,21 @@ create_new_program(GLcontext *ctx, struct state_key *key,
ASSERT(p.program->Base.NumInstructions <= MAX_INSTRUCTIONS);
/* Allocate final instruction array */
program->Base.Instructions
= _mesa_alloc_instructions(program->Base.NumInstructions);
if (!program->Base.Instructions) {
p.program->Base.Instructions
= _mesa_alloc_instructions(p.program->Base.NumInstructions);
if (!p.program->Base.Instructions) {
_mesa_error(ctx, GL_OUT_OF_MEMORY,
"generating tex env program");
return;
}
_mesa_copy_instructions(program->Base.Instructions, instBuffer,
program->Base.NumInstructions);
_mesa_copy_instructions(p.program->Base.Instructions, instBuffer,
p.program->Base.NumInstructions);
if (p.program->FogOption) {
_mesa_append_fog_code(ctx, p.program);
p.program->FogOption = GL_NONE;
}
/* Notify driver the fragment program has (actually) changed.
*/

5
src/mesa/state_tracker/st_context.c
View File

@ -26,6 +26,8 @@
**************************************************************************/
#include "main/imports.h"
#include "main/extensions.h"
#include "tnl/tnl.h"
#include "vbo/vbo.h"
#include "st_public.h"
#include "st_context.h"
@ -98,6 +100,9 @@ struct st_context *st_create_context( GLcontext *ctx,
/* XXXX This is temporary! */
_mesa_enable_sw_extensions(ctx);
/* we'll always do per-pixel fog in the fragment shader */
_tnl_allow_vertex_fog(ctx, GL_FALSE);
return st;
}