Mesa (master): st/wgl: formatting fixes in stw_framebuffer.c
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Fri May 30 17:52:53 UTC 2014
Module: Mesa
Branch: master
Commit: 4b05e3cb0fae142365c87f53cf3804266beddf2f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b05e3cb0fae142365c87f53cf3804266beddf2f
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 21 11:41:59 2014 -0600
st/wgl: formatting fixes in stw_framebuffer.c
And remove some unneeded #includes and INLINE qualifiers.
Reviewed-by: Charmaine Lee <charmainel at vmware.com>
---
src/gallium/state_trackers/wgl/stw_framebuffer.c | 152 ++++++++++------------
1 file changed, 70 insertions(+), 82 deletions(-)
diff --git a/src/gallium/state_trackers/wgl/stw_framebuffer.c b/src/gallium/state_trackers/wgl/stw_framebuffer.c
index 18ecb05..2b81b82 100644
--- a/src/gallium/state_trackers/wgl/stw_framebuffer.c
+++ b/src/gallium/state_trackers/wgl/stw_framebuffer.c
@@ -27,9 +27,7 @@
#include <windows.h>
-#include "pipe/p_format.h"
#include "pipe/p_screen.h"
-#include "util/u_format.h"
#include "util/u_memory.h"
#include "hud/hud_context.h"
#include "state_tracker/st_api.h"
@@ -68,9 +66,8 @@ stw_framebuffer_from_hwnd_locked(
* must be held, by this order. If there are still references to the
* framebuffer, nothing will happen.
*/
-static INLINE void
-stw_framebuffer_destroy_locked(
- struct stw_framebuffer *fb )
+static void
+stw_framebuffer_destroy_locked(struct stw_framebuffer *fb)
{
struct stw_framebuffer **link;
@@ -88,30 +85,30 @@ stw_framebuffer_destroy_locked(
*link = fb->next;
fb->next = NULL;
- if(fb->shared_surface)
- stw_dev->stw_winsys->shared_surface_close(stw_dev->screen, fb->shared_surface);
+ if (fb->shared_surface)
+ stw_dev->stw_winsys->shared_surface_close(stw_dev->screen,
+ fb->shared_surface);
stw_st_destroy_framebuffer_locked(fb->stfb);
-
+
pipe_mutex_unlock( fb->mutex );
pipe_mutex_destroy( fb->mutex );
-
+
FREE( fb );
}
void
-stw_framebuffer_release(
- struct stw_framebuffer *fb)
+stw_framebuffer_release(struct stw_framebuffer *fb)
{
assert(fb);
pipe_mutex_unlock( fb->mutex );
}
-static INLINE void
-stw_framebuffer_get_size( struct stw_framebuffer *fb )
+static void
+stw_framebuffer_get_size(struct stw_framebuffer *fb)
{
LONG width, height;
RECT client_rect;
@@ -154,8 +151,8 @@ stw_framebuffer_get_size( struct stw_framebuffer *fb )
if (width != fb->width || height != fb->height) {
fb->must_resize = TRUE;
- fb->width = width;
- fb->height = height;
+ fb->width = width;
+ fb->height = height;
}
client_pos.x = 0;
@@ -191,35 +188,34 @@ stw_framebuffer_get_size( struct stw_framebuffer *fb )
* @sa http://msdn.microsoft.com/en-us/library/ms644960(VS.85).aspx
*/
LRESULT CALLBACK
-stw_call_window_proc(
- int nCode,
- WPARAM wParam,
- LPARAM lParam )
+stw_call_window_proc(int nCode, WPARAM wParam, LPARAM lParam)
{
struct stw_tls_data *tls_data;
PCWPSTRUCT pParams = (PCWPSTRUCT)lParam;
struct stw_framebuffer *fb;
-
+
tls_data = stw_tls_get_data();
- if(!tls_data)
+ if (!tls_data)
return 0;
-
+
if (nCode < 0 || !stw_dev)
return CallNextHookEx(tls_data->hCallWndProcHook, nCode, wParam, lParam);
if (pParams->message == WM_WINDOWPOSCHANGED) {
/* We handle WM_WINDOWPOSCHANGED instead of WM_SIZE because according to
- * http://blogs.msdn.com/oldnewthing/archive/2008/01/15/7113860.aspx
- * WM_SIZE is generated from WM_WINDOWPOSCHANGED by DefWindowProc so it
- * can be masked out by the application. */
+ * http://blogs.msdn.com/oldnewthing/archive/2008/01/15/7113860.aspx
+ * WM_SIZE is generated from WM_WINDOWPOSCHANGED by DefWindowProc so it
+ * can be masked out by the application.
+ */
LPWINDOWPOS lpWindowPos = (LPWINDOWPOS)pParams->lParam;
- if((lpWindowPos->flags & SWP_SHOWWINDOW) ||
- !(lpWindowPos->flags & SWP_NOMOVE) ||
- !(lpWindowPos->flags & SWP_NOSIZE)) {
+ if ((lpWindowPos->flags & SWP_SHOWWINDOW) ||
+ !(lpWindowPos->flags & SWP_NOMOVE) ||
+ !(lpWindowPos->flags & SWP_NOSIZE)) {
fb = stw_framebuffer_from_hwnd( pParams->hwnd );
- if(fb) {
- /* Size in WINDOWPOS includes the window frame, so get the size
- * of the client area via GetClientRect. */
+ if (fb) {
+ /* Size in WINDOWPOS includes the window frame, so get the size
+ * of the client area via GetClientRect.
+ */
stw_framebuffer_get_size(fb);
stw_framebuffer_release(fb);
}
@@ -228,7 +224,7 @@ stw_call_window_proc(
else if (pParams->message == WM_DESTROY) {
pipe_mutex_lock( stw_dev->fb_mutex );
fb = stw_framebuffer_from_hwnd_locked( pParams->hwnd );
- if(fb)
+ if (fb)
stw_framebuffer_destroy_locked(fb);
pipe_mutex_unlock( stw_dev->fb_mutex );
}
@@ -238,9 +234,7 @@ stw_call_window_proc(
struct stw_framebuffer *
-stw_framebuffer_create(
- HDC hdc,
- int iPixelFormat )
+stw_framebuffer_create(HDC hdc, int iPixelFormat)
{
HWND hWnd;
struct stw_framebuffer *fb;
@@ -248,9 +242,9 @@ stw_framebuffer_create(
/* We only support drawing to a window. */
hWnd = WindowFromDC( hdc );
- if(!hWnd)
+ if (!hWnd)
return NULL;
-
+
fb = CALLOC_STRUCT( stw_framebuffer );
if (fb == NULL)
return NULL;
@@ -259,10 +253,11 @@ stw_framebuffer_create(
fb->iPixelFormat = iPixelFormat;
/*
- * We often need a displayable pixel format to make GDI happy. Set it here (always 1, i.e.,
- * out first pixel format) where appropriat.
+ * We often need a displayable pixel format to make GDI happy. Set it
+ * here (always 1, i.e., out first pixel format) where appropriate.
*/
- fb->iDisplayablePixelFormat = iPixelFormat <= stw_dev->pixelformat_count ? iPixelFormat : 1;
+ fb->iDisplayablePixelFormat = iPixelFormat <= stw_dev->pixelformat_count
+ ? iPixelFormat : 1;
fb->pfi = pfi = stw_pixelformat_get_info( iPixelFormat );
fb->stfb = stw_st_create_framebuffer( fb );
@@ -304,13 +299,13 @@ stw_framebuffer_create(
return fb;
}
+
/**
* Have ptr reference fb. The referenced framebuffer should be locked.
*/
void
-stw_framebuffer_reference(
- struct stw_framebuffer **ptr,
- struct stw_framebuffer *fb)
+stw_framebuffer_reference(struct stw_framebuffer **ptr,
+ struct stw_framebuffer *fb)
{
struct stw_framebuffer *old_fb = *ptr;
@@ -336,25 +331,24 @@ stw_framebuffer_reference(
* Update the framebuffer's size if necessary.
*/
void
-stw_framebuffer_update(
- struct stw_framebuffer *fb)
+stw_framebuffer_update(struct stw_framebuffer *fb)
{
assert(fb->stfb);
assert(fb->height);
assert(fb->width);
-
- /* XXX: It would be nice to avoid checking the size again -- in theory
- * stw_call_window_proc would have cought the resize and stored the right
- * size already, but unfortunately threads created before the DllMain is
+
+ /* XXX: It would be nice to avoid checking the size again -- in theory
+ * stw_call_window_proc would have cought the resize and stored the right
+ * size already, but unfortunately threads created before the DllMain is
* called don't get a DLL_THREAD_ATTACH notification, and there is no way
* to know of their existing without using the not very portable PSAPI.
*/
stw_framebuffer_get_size(fb);
-}
+}
void
-stw_framebuffer_cleanup( void )
+stw_framebuffer_cleanup(void)
{
struct stw_framebuffer *fb;
struct stw_framebuffer *next;
@@ -367,14 +361,14 @@ stw_framebuffer_cleanup( void )
fb = stw_dev->fb_head;
while (fb) {
next = fb->next;
-
+
pipe_mutex_lock(fb->mutex);
stw_framebuffer_destroy_locked(fb);
-
+
fb = next;
}
stw_dev->fb_head = NULL;
-
+
pipe_mutex_unlock( stw_dev->fb_mutex );
}
@@ -401,8 +395,7 @@ stw_framebuffer_from_hdc_locked(
* Given an hdc, return the corresponding stw_framebuffer.
*/
struct stw_framebuffer *
-stw_framebuffer_from_hdc(
- HDC hdc )
+stw_framebuffer_from_hdc(HDC hdc)
{
struct stw_framebuffer *fb;
@@ -421,8 +414,7 @@ stw_framebuffer_from_hdc(
* Given an hdc, return the corresponding stw_framebuffer.
*/
struct stw_framebuffer *
-stw_framebuffer_from_hwnd(
- HWND hwnd )
+stw_framebuffer_from_hwnd(HWND hwnd)
{
struct stw_framebuffer *fb;
@@ -435,9 +427,7 @@ stw_framebuffer_from_hwnd(
BOOL APIENTRY
-DrvSetPixelFormat(
- HDC hdc,
- LONG iPixelFormat )
+DrvSetPixelFormat(HDC hdc, LONG iPixelFormat)
{
uint count;
uint index;
@@ -452,7 +442,7 @@ DrvSetPixelFormat(
return FALSE;
fb = stw_framebuffer_from_hdc_locked(hdc);
- if(fb) {
+ if (fb) {
/*
* SetPixelFormat must be called only once. However ignore
* pbuffers, for which the framebuffer object is created first.
@@ -465,37 +455,36 @@ DrvSetPixelFormat(
}
fb = stw_framebuffer_create(hdc, iPixelFormat);
- if(!fb) {
+ if (!fb) {
return FALSE;
}
-
+
stw_framebuffer_release( fb );
- /* Some applications mistakenly use the undocumented wglSetPixelFormat
- * function instead of SetPixelFormat, so we call SetPixelFormat here to
+ /* Some applications mistakenly use the undocumented wglSetPixelFormat
+ * function instead of SetPixelFormat, so we call SetPixelFormat here to
* avoid opengl32.dll's wglCreateContext to fail */
if (GetPixelFormat(hdc) == 0) {
BOOL bRet = SetPixelFormat(hdc, iPixelFormat, NULL);
assert(bRet);
}
-
+
return TRUE;
}
int
-stw_pixelformat_get(
- HDC hdc )
+stw_pixelformat_get(HDC hdc)
{
int iPixelFormat = 0;
struct stw_framebuffer *fb;
fb = stw_framebuffer_from_hdc(hdc);
- if(fb) {
+ if (fb) {
iPixelFormat = fb->iPixelFormat;
stw_framebuffer_release(fb);
}
-
+
return iPixelFormat;
}
@@ -518,17 +507,19 @@ DrvPresentBuffers(HDC hdc, PGLPRESENTBUFFERSDATA data)
res = (struct pipe_resource *)data->pPrivateData;
- if(data->hSharedSurface != fb->hSharedSurface) {
- if(fb->shared_surface) {
+ if (data->hSharedSurface != fb->hSharedSurface) {
+ if (fb->shared_surface) {
stw_dev->stw_winsys->shared_surface_close(screen, fb->shared_surface);
fb->shared_surface = NULL;
}
fb->hSharedSurface = data->hSharedSurface;
- if(data->hSharedSurface &&
+ if (data->hSharedSurface &&
stw_dev->stw_winsys->shared_surface_open) {
- fb->shared_surface = stw_dev->stw_winsys->shared_surface_open(screen, fb->hSharedSurface);
+ fb->shared_surface =
+ stw_dev->stw_winsys->shared_surface_open(screen,
+ fb->hSharedSurface);
}
}
@@ -564,7 +555,7 @@ stw_framebuffer_present_locked(HDC hdc,
struct stw_framebuffer *fb,
struct pipe_resource *res)
{
- if(stw_dev->callbacks.wglCbPresentBuffers &&
+ if (stw_dev->callbacks.wglCbPresentBuffers &&
stw_dev->stw_winsys->compose) {
GLCBPRESENTBUFFERSDATA data;
@@ -595,8 +586,7 @@ stw_framebuffer_present_locked(HDC hdc,
BOOL APIENTRY
-DrvSwapBuffers(
- HDC hdc )
+DrvSwapBuffers(HDC hdc)
{
struct stw_context *ctx;
struct stw_framebuffer *fb;
@@ -628,11 +618,9 @@ DrvSwapBuffers(
BOOL APIENTRY
-DrvSwapLayerBuffers(
- HDC hdc,
- UINT fuPlanes )
+DrvSwapLayerBuffers(HDC hdc, UINT fuPlanes)
{
- if(fuPlanes & WGL_SWAP_MAIN_PLANE)
+ if (fuPlanes & WGL_SWAP_MAIN_PLANE)
return DrvSwapBuffers(hdc);
return FALSE;
More information about the mesa-commit
mailing list