fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 23:09:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Brian Paul 2017-03-27 08:30:43 -06:00
parent 6255cc654d
commit b71ef173a5
3 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mesa/state_tracker/st_cb_fbo.h
View file

@ -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);

15
src/mesa/state_tracker/st_cb_viewport.c
View file

@ -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)
{

14
src/mesa/state_tracker/st_manager.c
View file

@ -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.