Commit b71ef173 authored by Brian Paul's avatar Brian Paul

st/mesa: move duplicated st_ws_framebuffer() function into header file

Reviewed-by: default avatarMarek Olšák <marek.olsak@amd.com>
parent 6255cc65
......@@ -30,6 +30,7 @@
#define ST_CB_FBO_H
#include "main/compiler.h"
#include "main/fbobject.h"
#include "main/glheader.h"
#include "main/mtypes.h"
......@@ -74,6 +75,22 @@ st_renderbuffer(struct gl_renderbuffer *rb)
}
/**
* Cast wrapper to convert a struct gl_framebuffer to an st_framebuffer.
* Return NULL if the struct gl_framebuffer is a user-created framebuffer.
* We'll only return non-null for window system framebuffers.
* Note that this function may fail.
*/
static inline struct st_framebuffer *
st_ws_framebuffer(struct gl_framebuffer *fb)
{
/* FBO cannot be casted. See st_new_framebuffer */
if (fb && _mesa_is_winsys_fbo(fb))
return (struct st_framebuffer *) fb;
return NULL;
}
extern struct gl_renderbuffer *
st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw);
......
......@@ -27,26 +27,13 @@
#include "main/glheader.h"
#include "st_context.h"
#include "st_cb_fbo.h"
#include "st_cb_viewport.h"
#include "pipe/p_state.h"
#include "pipe/p_defines.h"
#include "util/u_atomic.h"
/**
* Cast wrapper to convert a struct gl_framebuffer to an st_framebuffer.
* Return NULL if the struct gl_framebuffer is a user-created framebuffer.
* We'll only return non-null for window system framebuffers.
* Note that this function may fail.
*/
static inline struct st_framebuffer *
st_ws_framebuffer(struct gl_framebuffer *fb)
{
/* FBO cannot be casted. See st_new_framebuffer */
if (fb && _mesa_is_winsys_fbo(fb))
return (struct st_framebuffer *) fb;
return NULL;
}
static void st_viewport(struct gl_context *ctx)
{
......
......@@ -58,20 +58,6 @@
#include "util/u_atomic.h"
#include "util/u_surface.h"
/**
* Cast wrapper to convert a struct gl_framebuffer to an st_framebuffer.
* Return NULL if the struct gl_framebuffer is a user-created framebuffer.
* We'll only return non-null for window system framebuffers.
* Note that this function may fail.
*/
static inline struct st_framebuffer *
st_ws_framebuffer(struct gl_framebuffer *fb)
{
/* FBO cannot be casted. See st_new_framebuffer */
if (fb && _mesa_is_winsys_fbo(fb))
return (struct st_framebuffer *) fb;
return NULL;
}
/**
* Map an attachment to a buffer index.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment