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

Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline

Browse Source
This commit is contained in:
Nian Wu
2007-03-23 17:00:28 +08:00
parent 2eb656ef4f 002762b13a
commit ad76128204
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/texenvprogram.c
+3 -4
View File
@@ -1013,7 +1013,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
p.program->NumTexIndirections = 1; /* correct? */
p.program->NumTexInstructions = 0;
p.program->NumAluInstructions = 0;
p.program->Base.String = 0;
p.program->Base.String = NULL;
p.program->Base.NumInstructions =
p.program->Base.NumTemporaries =
p.program->Base.NumParameters =
@@ -1102,9 +1102,8 @@ create_new_program(GLcontext *ctx, struct state_key *key,
"generating tex env program");
return;
}
_mesa_memcpy(program->Base.Instructions, instBuffer,
sizeof(struct prog_instruction)
* program->Base.NumInstructions);
_mesa_copy_instructions(program->Base.Instructions, instBuffer,
program->Base.NumInstructions);
/* Notify driver the fragment program has (actually) changed.
*/
src/mesa/main/teximage.c
+6 -6
View File
@@ -2061,12 +2061,6 @@ copytexsubimage_error_check2( GLcontext *ctx, GLuint dimensions,
}
if (teximage->IsCompressed) {
if (!_mesa_source_buffer_exists(ctx, teximage->_BaseFormat)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glCopyTexSubImage%dD(missing readbuffer)", dimensions);
return GL_TRUE;
}
if (target != GL_TEXTURE_2D) {
_mesa_error(ctx, GL_INVALID_ENUM,
"glCopyTexSubImage%d(target)", dimensions);
@@ -2096,6 +2090,12 @@ copytexsubimage_error_check2( GLcontext *ctx, GLuint dimensions,
return GL_TRUE;
}
if (!_mesa_source_buffer_exists(ctx, teximage->_BaseFormat)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glCopyTexSubImage%dD(missing readbuffer)", dimensions);
return GL_TRUE;
}
if (teximage->_BaseFormat == GL_DEPTH_COMPONENT) {
if (!ctx->ReadBuffer->_DepthBuffer) {
_mesa_error(ctx, GL_INVALID_OPERATION,
src/mesa/tnl/t_vp_build.c
+2 -3
View File
@@ -1416,9 +1416,8 @@ create_new_program( const struct state_key *key,
else
p.temp_reserved = ~((1<<max_temps)-1);
p.program->Base.Instructions
= (struct prog_instruction*) MALLOC(sizeof(struct prog_instruction) * MAX_INSN);
p.program->Base.String = 0;
p.program->Base.Instructions = _mesa_alloc_instructions(MAX_INSN);
p.program->Base.String = NULL;
p.program->Base.NumInstructions =
p.program->Base.NumTemporaries =
p.program->Base.NumParameters =