r300g: minor fixups
This commit is contained in:
@@ -122,9 +122,10 @@ static void r300_clear(struct pipe_context* pipe,
|
||||
*/
|
||||
|
||||
struct r300_context* r300 = r300_context(pipe);
|
||||
struct pipe_framebuffer_state* fb =
|
||||
struct pipe_framebuffer_state *fb =
|
||||
(struct pipe_framebuffer_state*)r300->fb_state.state;
|
||||
|
||||
/* Clear. */
|
||||
r300_blitter_begin(r300, R300_CLEAR);
|
||||
util_blitter_clear(r300->blitter,
|
||||
fb->width,
|
||||
|
@@ -327,7 +327,7 @@ static void r300_init_states(struct pipe_context *pipe)
|
||||
|
||||
/* Initialize the hyperz state. */
|
||||
{
|
||||
BEGIN_CB(&hyperz->cb_begin, 6);
|
||||
BEGIN_CB(&hyperz->cb_begin, r300->hyperz_state.size);
|
||||
OUT_CB_REG(R300_ZB_BW_CNTL, 0);
|
||||
OUT_CB_REG(R300_ZB_DEPTHCLEARVALUE, 0);
|
||||
OUT_CB_REG(R300_SC_HYPERZ, 0x1C);
|
||||
|
@@ -308,9 +308,9 @@ struct r300_surface {
|
||||
|
||||
enum r300_buffer_domain domain;
|
||||
|
||||
uint32_t offset;
|
||||
uint32_t offset; /* COLOROFFSET or DEPTHOFFSET. */
|
||||
uint32_t pitch; /* COLORPITCH or DEPTHPITCH. */
|
||||
uint32_t format; /* US_OUT_FMT or R300_ZB_FORMAT. */
|
||||
uint32_t format; /* US_OUT_FMT or ZB_FORMAT. */
|
||||
};
|
||||
|
||||
struct r300_texture {
|
||||
|
@@ -21,9 +21,8 @@
|
||||
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
|
||||
|
||||
#include "r300_hyperz.h"
|
||||
#include "r300_context.h"
|
||||
#include "r300_hyperz.h"
|
||||
#include "r300_reg.h"
|
||||
#include "r300_fs.h"
|
||||
|
||||
|
@@ -2617,7 +2617,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
# define R300_WR_COMP_DISABLE (0 << 4)
|
||||
# define R300_WR_COMP_ENABLE (1 << 4)
|
||||
# define R300_ZB_CB_CLEAR_RMW (0 << 5)
|
||||
# define R300_ZB_CB_CLEAR_CACHE_LINEAR (1 << 5)
|
||||
# define R300_ZB_CB_CLEAR_CACHE_LINE_WRITE_ONLY (1 << 5)
|
||||
# define R300_FORCE_COMPRESSED_STENCIL_VALUE_DISABLE (0 << 6)
|
||||
# define R300_FORCE_COMPRESSED_STENCIL_VALUE_ENABLE (1 << 6)
|
||||
|
||||
|
Reference in New Issue
Block a user