diff options
| author | Brian <brian@yutani.localnet.net> | 2007-04-28 08:01:18 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-04-28 08:01:18 -0600 |
| commit | 4ca7c804db63c9eeaddf1f65dc92006e2cabacec (patch) | |
| tree | 6ac025b7b3fb634e889a8b8ebd72f07127a11cf9 /src/mesa/shader | |
| parent | bfaf6156fbc81c8073b7562365331d306d4de75a (diff) | |
fix GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB bug (10787)
Diffstat (limited to 'src/mesa/shader')
| -rw-r--r-- | src/mesa/shader/arbprogram.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c index 5583f16ce8..4b5f63ef92 100644 --- a/src/mesa/shader/arbprogram.c +++ b/src/mesa/shader/arbprogram.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 + * Version: 7.0 * - * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -703,10 +703,18 @@ _mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params) * The spec says that even if this query returns true, there's * no guarantee that the program will run in hardware. */ - if (ctx->Driver.IsProgramNative) + if (prog->Id == 0) { + /* default/null program */ + *params = GL_FALSE; + } + else if (ctx->Driver.IsProgramNative) { + /* ask the driver */ *params = ctx->Driver.IsProgramNative( ctx, target, prog ); - else + } + else { + /* probably running in software */ *params = GL_TRUE; + } return; default: /* continue with fragment-program only queries below */ |