ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Reduce initial wined3d_string_buffer buffer size to 32. 

Also try to avoid unnecessary HeapReAlloc() + vsnprintf() loops when we
know the required size of the buffer.
This commit is contained in:
Matteo Bruni 2015-04-24 22:25:42 +02:00 committed by Alexandre Julliard
parent 64463b81df
commit 54b4df6731
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/wined3d/shader.c
View File

@ -253,7 +253,7 @@ void string_buffer_clear(struct wined3d_string_buffer *buffer)
BOOL string_buffer_init(struct wined3d_string_buffer *buffer) BOOL string_buffer_init(struct wined3d_string_buffer *buffer)
{ {
buffer->buffer_size = 16384; buffer->buffer_size = 32;
if (!(buffer->buffer = HeapAlloc(GetProcessHeap(), 0, buffer->buffer_size))) if (!(buffer->buffer = HeapAlloc(GetProcessHeap(), 0, buffer->buffer_size)))
{ {
ERR("Failed to allocate shader buffer memory.\n"); ERR("Failed to allocate shader buffer memory.\n");
@ -274,6 +274,7 @@ int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va
unsigned int rem; unsigned int rem;
int rc; int rc;
char *new_buffer; char *new_buffer;
unsigned int new_buffer_size;
for (;;) for (;;)
{ {
@ -283,14 +284,17 @@ int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va
if (rc >= 0 /* C89 */ && (unsigned int)rc < rem /* C99 */) if (rc >= 0 /* C89 */ && (unsigned int)rc < rem /* C99 */)
break; break;
if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2))) new_buffer_size = buffer->buffer_size * 2;
while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size)
new_buffer_size *= 2;
if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, new_buffer_size)))
{ {
ERR("Failed to grow buffer.\n"); ERR("Failed to grow buffer.\n");
buffer->buffer[buffer->content_size] = '\0'; buffer->buffer[buffer->content_size] = '\0';
return -1; return -1;
} }
buffer->buffer = new_buffer; buffer->buffer = new_buffer;
buffer->buffer_size = buffer->buffer_size * 2; buffer->buffer_size = new_buffer_size;
} }
buffer->content_size += rc; buffer->content_size += rc;