diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-12 12:55:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 12:55:53 +0200 |
| commit | aabbd00284640a4789f96702c134ea40b11b402e (patch) | |
| tree | 8363659a6551644b0d89401681e2909d5451a119 /drivers | |
| parent | c5e0e31f5106d7d91dc478af1f86740c74cea824 (diff) | |
| parent | b2a38854fdde296fd2d7da139a29b23a18ab494d (diff) | |
Merge pull request #10908 from hpvb/fix-unused-variables
Fix unused variable warnings
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.cpp | 7 | ||||
| -rw-r--r-- | drivers/unix/socket_helpers.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index ba380bab7b..b99817fb12 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -595,7 +595,6 @@ RID RasterizerStorageGLES3::texture_create() { void RasterizerStorageGLES3::texture_allocate(RID p_texture, int p_width, int p_height, Image::Format p_format, uint32_t p_flags) { - int components; GLenum format; GLenum internal_format; GLenum type; @@ -777,8 +776,6 @@ void RasterizerStorageGLES3::texture_set_data(RID p_texture, const Ref<Image> &p int tsize = 0; - int block = Image::get_format_block_size(img->get_format()); - for (int i = 0; i < mipmaps; i++) { int size, ofs; @@ -789,10 +786,6 @@ void RasterizerStorageGLES3::texture_set_data(RID p_texture, const Ref<Image> &p if (texture->compressed) { glPixelStorei(GL_UNPACK_ALIGNMENT, 4); - //this is not needed, as compressed takes the regular size, even if blocks extend it - //int bw = (w % block != 0) ? w + (block - w % block) : w; - //int bh = (h % block != 0) ? h + (block - h % block) : h; - int bw = w; int bh = h; diff --git a/drivers/unix/socket_helpers.h b/drivers/unix/socket_helpers.h index 3fc0144294..0995e5236f 100644 --- a/drivers/unix/socket_helpers.h +++ b/drivers/unix/socket_helpers.h @@ -64,7 +64,6 @@ static size_t _set_sockaddr(struct sockaddr_storage *p_addr, const IP_Address &p // IPv4 socket with IPv6 address ERR_FAIL_COND_V(!p_ip.is_ipv4(), 0); - uint32_t ipv4 = *((uint32_t *)p_ip.get_ipv4()); struct sockaddr_in *addr4 = (struct sockaddr_in *)p_addr; addr4->sin_family = AF_INET; addr4->sin_port = htons(p_port); // short, network byte order |