diff options
| author | Paul Berry <[email protected]> | 2012-07-18 12:54:48 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2012-07-26 10:38:05 -0700 |
| commit | 284ad9c3b29a6d6f0bade050ea9e949d67967983 (patch) | |
| tree | 7c50cc152a6be64a4e31fb5545a51ce41fd33873 /src/mesa/state_tracker/st_manager.c | |
| parent | e72f20641a6ea7875b6021aac13e778ada3b3d50 (diff) | |
mesa: Make more consistent use of _mesa_is_{user,winsys}_fbo()
A lot of code was still differentiating between between winsys and
user fbos by testing the fbo's name against zero. This converts
everything in core mesa, the state tracker, and src/mesa/program over
to use _mesa_is_user_fbo() and _mesa_is_winsys_fbo().
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_manager.c')
| -rw-r--r-- | src/mesa/state_tracker/st_manager.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index 748624f3d94..875e0c44ac1 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -64,7 +64,9 @@ static INLINE struct st_framebuffer * st_ws_framebuffer(struct gl_framebuffer *fb) { /* FBO cannot be casted. See st_new_framebuffer */ - return (struct st_framebuffer *) ((fb && !fb->Name) ? fb : NULL); + if (fb && _mesa_is_winsys_fbo(fb)) + return (struct st_framebuffer *) fb; + return NULL; } /** |