projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into gallium_draw_llvm
[mesa.git]
/
src
/
gallium
/
drivers
/
i915
/
i915_state_emit.c
diff --git
a/src/gallium/drivers/i915/i915_state_emit.c
b/src/gallium/drivers/i915/i915_state_emit.c
index a3d4e3b04e524ad55ff3aeda0a58df3fef31f83a..51f0ef12bafce595d70f1cfdd56ee0db17cc0828 100644
(file)
--- a/
src/gallium/drivers/i915/i915_state_emit.c
+++ b/
src/gallium/drivers/i915/i915_state_emit.c
@@
-37,9
+37,9
@@
static unsigned translate_format( enum pipe_format format )
{
switch (format) {
static unsigned translate_format( enum pipe_format format )
{
switch (format) {
- case PIPE_FORMAT_
A8R8G8B
8_UNORM:
+ case PIPE_FORMAT_
B8G8R8A
8_UNORM:
return COLOR_BUF_ARGB8888;
return COLOR_BUF_ARGB8888;
- case PIPE_FORMAT_
R5G6B
5_UNORM:
+ case PIPE_FORMAT_
B5G6R
5_UNORM:
return COLOR_BUF_RGB565;
default:
assert(0);
return COLOR_BUF_RGB565;
default:
assert(0);
@@
-50,7
+50,7
@@
static unsigned translate_format( enum pipe_format format )
static unsigned translate_depth_format( enum pipe_format zformat )
{
switch (zformat) {
static unsigned translate_depth_format( enum pipe_format zformat )
{
switch (zformat) {
- case PIPE_FORMAT_
S8Z24
_UNORM:
+ case PIPE_FORMAT_
Z24S8
_UNORM:
return DEPTH_FRMT_24_FIXED_8_OTHER;
case PIPE_FORMAT_Z16_UNORM:
return DEPTH_FRMT_16_FIXED;
return DEPTH_FRMT_24_FIXED_8_OTHER;
case PIPE_FORMAT_Z16_UNORM:
return DEPTH_FRMT_16_FIXED;
@@
-244,6
+244,7
@@
i915_emit_hardware_state(struct i915_context *i915 )
OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
+ assert(tex);
OUT_BATCH(BUF_3D_ID_DEPTH |
BUF_3D_PITCH(tex->stride) | /* pitch in bytes */
ztile);
OUT_BATCH(BUF_3D_ID_DEPTH |
BUF_3D_PITCH(tex->stride) | /* pitch in bytes */
ztile);
@@
-259,7
+260,7
@@
i915_emit_hardware_state(struct i915_context *i915 )
if (cbuf_surface)
cformat = cbuf_surface->format;
else
if (cbuf_surface)
cformat = cbuf_surface->format;
else
- cformat = PIPE_FORMAT_
A8R8G8B
8_UNORM; /* arbitrary */
+ cformat = PIPE_FORMAT_
B8G8R8A
8_UNORM; /* arbitrary */
cformat = translate_format(cformat);
if (depth_surface)
cformat = translate_format(cformat);
if (depth_surface)