OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into gallium-0.2

Browse Source 
Conflicts:

	src/mesa/glapi/descrip.mms
	src/mesa/shader/grammar/descrip.mms
This commit is contained in:
Keith Whitwell
2008-10-10 15:26:28 +01:00
parent d7f1cb5b5a 7216679c19
commit 3a3801c143
58 changed files with 856 additions and 1969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/shader/program.c
View File

@@ -372,7 +372,11 @@ _mesa_reference_program(GLcontext *ctx,
assert(ptr);
if (*ptr && prog) {
/* sanity check */
ASSERT((*ptr)->Target == prog->Target);
if ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB)
ASSERT(prog->Target == GL_VERTEX_PROGRAM_ARB);
else if ((*ptr)->Target == GL_FRAGMENT_PROGRAM_ARB)
ASSERT(prog->Target == GL_FRAGMENT_PROGRAM_ARB ||
prog->Target == GL_FRAGMENT_PROGRAM_NV);
}
if (*ptr == prog) {
return; /* no change */