#include "svga_resource_buffer.h"
#include "svga_winsys.h"
#include "svga_context.h"
-
#include "svga_hw_reg.h"
struct pipe_resource *dst = NULL;
void *dst_map = NULL;
- dst = pipe_buffer_create( pipe->screen,
- PIPE_BIND_INDEX_BUFFER,
+ dst = pipe_buffer_create( pipe->screen,
+ PIPE_BIND_INDEX_BUFFER,
+ PIPE_USAGE_STATIC,
size );
if (dst == NULL)
goto fail;
nr,
dst_map );
- pipe_buffer_unmap( pipe, src, src_transfer );
- pipe_buffer_unmap( pipe, dst, dst_transfer );
+ pipe_buffer_unmap( pipe, src_transfer );
+ pipe_buffer_unmap( pipe, dst_transfer );
*out_buf = dst;
return PIPE_OK;
fail:
if (src_map)
- pipe_buffer_unmap( pipe, src, src_transfer );
+ pipe_buffer_unmap( pipe, src_transfer );
if (dst_map)
- pipe_buffer_unmap( pipe, dst, dst_transfer );
+ pipe_buffer_unmap( pipe, dst_transfer );
if (dst)
pipe->screen->resource_destroy( pipe->screen, dst );
int index_bias,
unsigned min_index,
unsigned max_index,
- unsigned prim,
+ unsigned prim,
unsigned start,
unsigned count )
{
unsigned hw_prim;
unsigned hw_count;
unsigned index_offset = start * index_size;
- int ret = PIPE_OK;
+ enum pipe_error ret = PIPE_OK;
hw_prim = svga_translate_prim(prim, count, &hw_count);
if (hw_count == 0)
goto done;
- if (index_buffer &&
- svga_buffer_is_user_buffer(index_buffer))
+ if (index_buffer &&
+ svga_buffer_is_user_buffer(index_buffer))
{
assert( index_buffer->width0 >= index_offset + count * index_size );
ret = u_upload_buffer( hwtnl->upload_ib,
+ 0,
index_offset,
count * index_size,
index_buffer,
&index_offset,
- &upload_buffer );
- if (ret)
+ &upload_buffer);
+ if (ret != PIPE_OK)
goto done;
/* Don't need to worry about refcounting index_buffer as this is
range.indexArray.stride = index_size;
range.indexWidth = index_size;
range.indexBias = index_bias;
-
+
ret = svga_hwtnl_prim( hwtnl, &range, min_index, max_index, index_buffer );
- if (ret)
+ if (ret != PIPE_OK)
goto done;
done:
u_translate_func gen_func;
enum pipe_error ret = PIPE_OK;
- if (hwtnl->api_fillmode != PIPE_POLYGON_MODE_FILL &&
- prim >= PIPE_PRIM_TRIANGLES)
+ if (hwtnl->api_fillmode != PIPE_POLYGON_MODE_FILL &&
+ prim >= PIPE_PRIM_TRIANGLES)
{
gen_type = u_unfilled_translator( prim,
index_size,
&gen_func );
}
-
if (gen_type == U_TRANSLATE_MEMCPY) {
- /* No need for translation, just pass through to hardware:
+ /* No need for translation, just pass through to hardware:
*/
return svga_hwtnl_simple_draw_range_elements( hwtnl, index_buffer,
index_size,
gen_size,
gen_func,
&gen_buf );
- if (ret)
+ if (ret != PIPE_OK)
goto done;
ret = svga_hwtnl_simple_draw_range_elements( hwtnl,
gen_prim,
0,
gen_nr );
- if (ret)
+ if (ret != PIPE_OK)
goto done;
done:
return ret;
}
}
-
-
-
-
-