projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/mesa: factor ucp-lowering logic into helper
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_fbo.c
diff --git
a/src/mesa/state_tracker/st_cb_fbo.c
b/src/mesa/state_tracker/st_cb_fbo.c
index 7cb4a3e1650be7699e1c464a1cafc64fa7ab6b82..2455a351c49a65108f757a06a2a29b934a3da878 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_fbo.c
+++ b/
src/mesa/state_tracker/st_cb_fbo.c
@@
-33,7
+33,7
@@
*/
*/
-#include "main/imports.h"
+
#include "main/context.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
#include "main/context.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
@@
-56,7
+56,7
@@
#include "st_util.h"
#include "st_manager.h"
#include "st_util.h"
#include "st_manager.h"
-#include "util/u_format.h"
+#include "util/
format/
u_format.h"
#include "util/u_inlines.h"
#include "util/u_surface.h"
#include "util/u_inlines.h"
#include "util/u_surface.h"
@@
-355,6
+355,7
@@
st_new_renderbuffer_fb(enum pipe_format format, unsigned samples, boolean sw)
case PIPE_FORMAT_R8G8B8X8_UNORM:
case PIPE_FORMAT_B8G8R8X8_UNORM:
case PIPE_FORMAT_X8R8G8B8_UNORM:
case PIPE_FORMAT_R8G8B8X8_UNORM:
case PIPE_FORMAT_B8G8R8X8_UNORM:
case PIPE_FORMAT_X8R8G8B8_UNORM:
+ case PIPE_FORMAT_R8G8B8_UNORM:
strb->Base.InternalFormat = GL_RGB8;
break;
case PIPE_FORMAT_R8G8B8A8_SRGB:
strb->Base.InternalFormat = GL_RGB8;
break;
case PIPE_FORMAT_R8G8B8A8_SRGB:
@@
-400,6
+401,9
@@
st_new_renderbuffer_fb(enum pipe_format format, unsigned samples, boolean sw)
case PIPE_FORMAT_R16G16B16A16_UNORM:
strb->Base.InternalFormat = GL_RGBA16;
break;
case PIPE_FORMAT_R16G16B16A16_UNORM:
strb->Base.InternalFormat = GL_RGBA16;
break;
+ case PIPE_FORMAT_R16G16B16_UNORM:
+ strb->Base.InternalFormat = GL_RGB16;
+ break;
case PIPE_FORMAT_R8_UNORM:
strb->Base.InternalFormat = GL_R8;
break;
case PIPE_FORMAT_R8_UNORM:
strb->Base.InternalFormat = GL_R8;
break;
@@
-416,6
+420,7
@@
st_new_renderbuffer_fb(enum pipe_format format, unsigned samples, boolean sw)
strb->Base.InternalFormat = GL_RGBA32F;
break;
case PIPE_FORMAT_R32G32B32X32_FLOAT:
strb->Base.InternalFormat = GL_RGBA32F;
break;
case PIPE_FORMAT_R32G32B32X32_FLOAT:
+ case PIPE_FORMAT_R32G32B32_FLOAT:
strb->Base.InternalFormat = GL_RGB32F;
break;
case PIPE_FORMAT_R16G16B16A16_FLOAT:
strb->Base.InternalFormat = GL_RGB32F;
break;
case PIPE_FORMAT_R16G16B16A16_FLOAT: